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

Revert "Merge pull request #502 from munki/msulink"

Browse Source 
This reverts commit 6bb4936be8, reversing
changes made to c2239c5de8.
This commit is contained in:
Greg Neagle
2015-08-19 12:03:07 -07:00
parent 6bb4936be8
commit 05dae35e23
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/pkgtemplate/Scripts_app/preinstall
View File

@@ -1,11 +1,13 @@
#!/bin/sh
# Replace any Managed Software Update.app bundle with a symlink to Managed
# Software Center.app
# remove any Managed Software Update.app bundle since the installer
# won't replace a bundle with a symlink, leading to yucky stuff like
# "/Applications/Utilities/Managed Software Update.app 1"
if [ -d "$3/Applications/Utilities/Managed Software Update.app" ] ; then
/bin/rm -r "$3/Applications/Utilities/Managed Software Update.app"
# make a symlink for the old MSU.app
/bin/ln -s "$3/Applications/Managed Software Center.app" \
"$3/Applications/Utilities/Managed Software Update.app"
fi
if [ -d "$3/Applications/Utilities/Managed Software Update.app 1" ] ; then
/bin/rm -r "$3/Applications/Utilities/Managed Software Update.app 1"
fi

5
code/tools/make_munki_mpkg.sh
View File

@@ -174,7 +174,7 @@ echo " metapackage version: $MPKGVERSION"
echo
# Build Managed Software Center.
echo "Building Managed Software Center.xcodeproj..."
echo "Building Managed Software Update.xcodeproj..."
pushd "$MUNKIROOT/code/apps/Managed Software Center" > /dev/null
/usr/bin/xcodebuild -project "Managed Software Center.xcodeproj" -alltargets clean > /dev/null
/usr/bin/xcodebuild -project "Managed Software Center.xcodeproj" -alltargets build > /dev/null
@@ -368,6 +368,7 @@ echo "Creating applications package template..."
# Create directory structure.
APPROOT="$PKGTMP/munki_app"
mkdir -m 1775 "$APPROOT"
mkdir -p "$APPROOT/Applications/Utilities"
chmod -R 775 "$APPROOT/Applications"
# Copy Managed Software Center application.
cp -R "$MSCAPP" "$APPROOT/Applications/"
@@ -375,6 +376,8 @@ cp -R "$MSCAPP" "$APPROOT/Applications/"
cp -R "$MSAPP" "$APPROOT/Applications/Managed Software Center.app/Contents/Resources/"
# make sure not writeable by group or other
chmod -R go-w "$APPROOT/Applications/Managed Software Center.app"
# make a symlink for the old MSU.app
ln -s "../Managed Software Center.app" "$APPROOT/Applications/Utilities/Managed Software Update.app"
# Create package info file.
APPSIZE=`du -sk $APPROOT | cut -f1`
NFILES=$(echo `find $APPROOT/ | wc -l`)