Mac installer: make my changes for OS 10.11 El Capitan compatibility …

…work with branded versions of BOINC (GridRepublic, etc.)
MrBrain295 · Jul 3, 2015 · 3586e40 · 3586e40
1 parent e66a572
commit 3586e40
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/mac_installer/postinstall b/mac_installer/postinstall
@@ -16,20 +16,21 @@ fi
 
 rm -f /tmp/BOINCInstallLog.txt
 
-pipath=`echo $1 | sed -e "s/BOINC.pkg/PostInstall.app/"`
-## echo "pi path = $pipath" >> /tmp/BOINCInstallLog.txt
+# PostInstall.app is in the same directory as the package (BOINC.pkg or GridRepublic.pkg, etc.)
+pipath=`dirname "$1"`/PostInstall.app/Contents/MacOS/PostInstall
+echo "PostInstall.app path = $pipath"
 
 # Run the Postinstall Application
 if [ "${COMMAND_LINE_INSTALL}" = "1" ]; then
-"$pipath/Contents/MacOS/PostInstall" -part1 >> /tmp/BOINCInstallLog.txt
+"$pipath" -part1 >> /tmp/BOINCInstallLog.txt
 sleep 2
-"$pipath/Contents/MacOS/PostInstall" -part2 >> /tmp/BOINCInstallLog.txt &
+"$pipath" -part2 >> /tmp/BOINCInstallLog.txt &
 else
-"$pipath/Contents/MacOS/PostInstall" -part1
+"$pipath" -part1
 sleep 2
 # part2 continues to run after Installer finishes, 
 # and fails unless we redirect stdout to a file
-"$pipath/Contents/MacOS/PostInstall" -part2 >> /tmp/BOINCInstallLog.txt &
+"$pipath" -part2 >> /tmp/BOINCInstallLog.txt &
 fi
 
 exit 0
diff --git a/mac_installer/postupgrade b/mac_installer/postupgrade
@@ -16,20 +16,21 @@ fi
 
 rm -f /tmp/BOINCInstallLog.txt
 
-pipath=`echo $1 | sed -e "s/BOINC.pkg/PostInstall.app/"`
-## echo "pi path = $pipath" >> /tmp/BOINCInstallLog.txt
+# PostInstall.app is in the same directory as the package (BOINC.pkg or GridRepublic.pkg, etc.)
+pipath=`dirname "$1"`/PostInstall.app/Contents/MacOS/PostInstall
+echo "PostInstall.app path = $pipath"
 
 # Run the Postinstall Application
 if [ "${COMMAND_LINE_INSTALL}" = "1" ]; then
-"$pipath/Contents/MacOS/PostInstall" -part1 >> /tmp/BOINCInstallLog.txt
+"$pipath" -part1 >> /tmp/BOINCInstallLog.txt
 sleep 2
-"$pipath/Contents/MacOS/PostInstall" -part2 >> /tmp/BOINCInstallLog.txt &
+"$pipath" -part2 >> /tmp/BOINCInstallLog.txt &
 else
-"$pipath/Contents/MacOS/PostInstall" -part1
+"$pipath" -part1
 sleep 2
 # part2 continues to run after Installer finishes, 
 # and fails unless we redirect stdout to a file
-"$pipath/Contents/MacOS/PostInstall" -part2 >> /tmp/BOINCInstallLog.txt &
+"$pipath" -part2 >> /tmp/BOINCInstallLog.txt &
 fi
 
 exit 0