From 70cab47fe1d5f4042bd3d608eae30b8188fa8886 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Sun, 2 Nov 2014 10:10:17 -0800 Subject: Fix syntax, add a check for failure to find PackageMaker, make sure it's a file. Change-Id: Id5bb23a8c5ebd8a63a51029de541cd32e484029c Reviewed-on: https://code.wireshark.org/review/5078 Reviewed-by: Guy Harris --- packaging/macosx/osx-dmg.sh.in | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'packaging') diff --git a/packaging/macosx/osx-dmg.sh.in b/packaging/macosx/osx-dmg.sh.in index af76d2ce9d..80bfcdbf74 100755 --- a/packaging/macosx/osx-dmg.sh.in +++ b/packaging/macosx/osx-dmg.sh.in @@ -45,7 +45,7 @@ auto_open_opt= ws_bin="$app_bundle/Contents/MacOS/Wireshark" readme_name="Read_me_first_qt.rtf" -if [ -x /Applications/Xcode.app/Contents/Applications/PackageMaker.app/Contents/MacOS/PackageMaker ] +if [ -f /Applications/Xcode.app/Contents/Applications/PackageMaker.app/Contents/MacOS/PackageMaker ] then # # Xcode 4 and later, with the "Auxiliary Tools for Xcode" @@ -55,18 +55,24 @@ then # work on Yosemite.) # packagemaker=/Applications/Xcode.app//Contents/Applications/PackageMaker.app/Contents/MacOS/PackageMaker -elif [ -x /Applications/Xcode.app/Developer/Tools/packagemaker ] +elif [ -f /Applications/Xcode.app/Developer/Tools/packagemaker ] +then packagemaker=/Applications/Xcode.app/Developer/Tools/packagemaker +elif [ -f /Applications/Xcode.app/Developer/usr/bin/packagemaker ] then -elif [ -x /Applications/Xcode.app/Developer/usr/bin/packagemaker ] packagemaker=/Applications/Xcode.app/Developer/usr/bin/packagemaker +elif [ -f /Developer/Tools/packagemaker ] then -elif [ -x /Developer/Tools/packagemaker packagemaker=/Developer/Tools/packagemaker -fi -elif [ -x /Developer/usr/bin/packagemaker +elif [ -f /Developer/usr/bin/packagemaker ] +then packagemaker=/Developer/usr/bin/packagemaker fi +if [ -z "$packagemaker" ] +then + echo "$0: couldn't find PackageMaker" 1>&2 + exit 1 +fi # Help message #---------------------------------------------------------- -- cgit v1.2.3