mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-01-06 06:29:56 -06:00
Code Issues Packages Projects Releases Wiki Activity

Removed detection of absolute path (#1016)

Browse Source 
* Removed detection of absolute path. It paths wrong if the supplied file is not in the cwd.

* Convert supplied config file to an absolute path and use that variable for all references to the file.

Co-authored-by: eholtam <(none)>
This commit is contained in:
eholtam
2020-09-03 17:48:02 -05:00
committed by GitHub
parent 85dde11196
commit 0e14dccdb1
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/tools/make_munki_mpkg.sh
View File

@@ -52,7 +52,7 @@ Usage: $(basename "$0") [-i id] [-r root] [-o dir] [-c package] [-s cert]
daemons without requiring a restart. Such a package is not
suited for upgrade installs or install via Munki itself.
-c plist Build a configuration package using the preferences defined in a
plist file
plist file.
-s cert_cn Sign distribution package with a Developer ID Installer
certificate from keychain. Provide the certificate's Common
Name. Ex: "Developer ID Installer: Munki (U8PN57A5N2)"
@@ -144,9 +144,11 @@ if [ ! -x "/usr/bin/xcodebuild" ]; then
exit 1
fi
if [[ "$CONFPKG" == "YES" ]] ; then
ABSDIRPATH="$(cd "$(dirname "$CONFPLIST")" ; pwd)"
if ! defaults read "$ABSDIRPATH/$CONFPLIST" 1>/dev/null ; then
echo "Could not read $CONFPLIST, or invalid plist!"
CONFDIRPATH="$(cd "$(dirname "$CONFPLIST")" ; pwd)"
CONFPLISTNAME="$(basename "$CONFPLIST")"
CONFFULLPATH="${CONFDIRPATH}/${CONFPLISTNAME}"
if ! defaults read "$CONFFULLPATH" 1>/dev/null ; then
echo "Could not read $CONFFULLPATH, or invalid plist!"
exit 1
fi
fi
@@ -254,7 +256,7 @@ echo " Munki source root: $MUNKIROOT"
echo " Output directory: $OUTPUTDIR"
echo " Include bootstrap pkg: $BOOTSTRAPPKG"
if [ "$CONFPKG" == "YES" ] ; then
echo " Include config pkg built with plist: $CONFPLIST"
echo " Include config pkg built with plist: $CONFFULLPATH"
else
echo " Include config pkg: NO"
fi
@@ -623,7 +625,7 @@ if [ "$CONFPKG" == "YES" ] ; then
mkdir -m 1775 "$CONFROOT"
mkdir -p "$CONFROOT/Library/Preferences"
# Copy prefs file
cp "$CONFPLIST" "$CONFROOT/Library/Preferences/ManagedInstalls.plist"
cp "$CONFFULLPATH" "$CONFROOT/Library/Preferences/ManagedInstalls.plist"
# Create package info file.
makeinfo config "$PKGTMP/info" norestart
fi