Updated make_munki_pkg.sh to handle new munkilib/version.plist

git-svn-id: http://munki.googlecode.com/svn/trunk@860 a4e17f2e-e282-11dd-95e1-755cbddbdd66
This commit is contained in:
Greg Neagle
2010-10-26 05:33:02 +00:00
parent 331813da86
commit 8b36ffe59e
+4 -1
View File
@@ -26,9 +26,11 @@ fi
# get the version for the package
pushd "$munkiroot/code/client/munkilib" >/dev/null
munkivers=`python -c "import munkicommon; print munkicommon.get_version()" | cut -d" " -f1`
#munkivers=`python -c "import munkicommon; print munkicommon.get_version()" | cut -d" " -f1`
munkivers=`defaults read "$munkiroot/code/client/munkilib/version" CFBundleShortVersionString`
popd >/dev/null
svnrev=`svnversion $munkiroot | cut -d: -f2 | tr -cd '[:digit:]'`
echo $svnrev > "$munkiroot/code/client/munkilib/svnversion"
VERS=$munkivers.$svnrev.0
@@ -119,6 +121,7 @@ if [ "$BUILD_USR" == "YES" ]; then
chmod -R 755 ./usr
cp "$munkiroot/code/client/"* ./usr/local/munki/ 2>&1 | grep -v "munkilib is a directory"
cp "$munkiroot"/code/client/munkilib/*.py ./usr/local/munki/munkilib/
cp "$munkiroot"/code/client/munkilib/version.plist ./usr/local/munki/munkilib/
# no pre/postflight scripts in the package, please
rm -f ./usr/local/munki/preflight
rm -f ./usr/local/munki/postflight