Merge pull request #239 from griff/fix-path-quotes

Fix issues that prevent build when path contains space
griff · Mar 22, 2020 · cc75338 · cc75338
2 parents 8e86c75 + b4a009b
commit cc75338
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 15 deletions.
diff --git a/MetaZ.xcodeproj/project.pbxproj b/MetaZ.xcodeproj/project.pbxproj
@@ -2361,7 +2361,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "set -o errexit\nbash $SRCROOT/Scripts/document_types.bash\n";
+			shellScript = "set -o errexit\nbash \"$SRCROOT/Scripts/document_types.bash\"\n";
 		};
 		1B76F8EA2415C0C400CB8810 /* Make Disk image */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -2386,7 +2386,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "set -o errexit\nbash $SRCROOT/Scripts/make_diskimage.bash\n";
+			shellScript = "set -o errexit\nbash \"$SRCROOT/Scripts/make_diskimage.bash\"\n";
 			showEnvVarsInLog = 0;
 		};
 		1B76F8EB2415C2AE00CB8810 /* Sparkle Sign */ = {
@@ -2407,7 +2407,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "set -o errexit\nbash $SRCROOT/Scripts/sparkle_sign.bash\n";
+			shellScript = "set -o errexit\nbash \"$SRCROOT/Scripts/sparkle_sign.bash\"\n";
 			showEnvVarsInLog = 0;
 		};
 		1B76F8EE24169B9900CB8810 /* Sign AppleScript */ = {
@@ -2433,7 +2433,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "set -o errexit\nbash $SRCROOT/Scripts/sign_applescript.bash\n";
+			shellScript = "set -o errexit\nbash \"$SRCROOT/Scripts/sign_applescript.bash\"\n";
 			showEnvVarsInLog = 0;
 		};
 		1BA9B57B2089550F00DDC17F /* Carthage Update Frameworks */ = {

diff --git a/Scripts/document_types.bash b/Scripts/document_types.bash
@@ -1,15 +1,17 @@
 set -o errexit
+set -x
 
 if [ -z "$BUILT_PRODUCTS_DIR" ] ; then
   BUILT_PRODUCTS_DIR=build/Debug/
 fi
 if [ -z "$PROJECT_NAME" ] ; then
   PROJECT_NAME=MetaZ
 fi
-OUTPUT=$BUILT_PRODUCTS_DIR/$PROJECT_NAME.app/Contents/Info.plist
+cd "$BUILT_PRODUCTS_DIR"
+OUTPUT="$PROJECT_NAME.app/Contents/Info.plist"
 
-for k in $BUILT_PRODUCTS_DIR/$PROJECT_NAME.app/Contents/PlugIns/*.mzdataprovider ; do
-  if [ -n "$(/usr/libexec/PlistBuddy -c "print :CFBundleDocumentTypes" $k/Contents/Info.plist)" ] ; then
+for k in "$PROJECT_NAME.app/Contents/PlugIns"/*.mzdataprovider ; do
+  if [ -n "$(/usr/libexec/PlistBuddy -c "print :CFBundleDocumentTypes" "$k/Contents/Info.plist")" ] ; then
     /usr/libexec/PlistBuddy -c "Add :PluginCFBundleDocumentTypes dict" "$OUTPUT"
     /usr/libexec/PlistBuddy -c "Merge $k/Contents/Info.plist :PluginCFBundleDocumentTypes" "$OUTPUT"
     while /usr/libexec/PlistBuddy -c "Copy :PluginCFBundleDocumentTypes:CFBundleDocumentTypes:0 CFBundleDocumentTypes:0" "$OUTPUT" 2> /dev/null ; do

diff --git a/Scripts/make_diskimage.bash b/Scripts/make_diskimage.bash
@@ -7,11 +7,11 @@ if [ "${CONFIGURATION}" != "Release" ]; then exit; fi
 rm -f "$BUILT_PRODUCTS_DIR/$PROJECT_NAME"*.dmg
 
 VERSION=$(/usr/libexec/PlistBuddy -c "print :CFBundleShortVersionString" "$BUILT_PRODUCTS_DIR/$PROJECT_NAME.app/Contents/Info.plist")
-SOURCE_FILES=($BUILT_PRODUCTS_DIR/${PROJECT_NAME}.app Thanks.txt License.txt)
-TEMPLATE_DMG=$SRCROOT/Release/template.dmg
-MASTER_DMG=$BUILT_PRODUCTS_DIR/${PROJECT_NAME}-${VERSION}.dmg
-WC_DMG=$CONFIGURATION_TEMP_DIR/wc.dmg
-WC_DIR=$CONFIGURATION_TEMP_DIR/wc
+SOURCE_FILES=("$BUILT_PRODUCTS_DIR/${PROJECT_NAME}.app" License.txt)
+TEMPLATE_DMG="$SRCROOT/Release/template.dmg"
+MASTER_DMG="$BUILT_PRODUCTS_DIR/${PROJECT_NAME}-${VERSION}.dmg"
+WC_DMG="$CONFIGURATION_TEMP_DIR/wc.dmg"
+WC_DIR="$CONFIGURATION_TEMP_DIR/wc"
 ARCHIVE_FILENAME="$PROJECT_NAME-$VERSION.zip"
 export GITV=`git log -n1 --pretty=oneline --format=%h`
 
@@ -33,15 +33,15 @@ rm -r "${TEMPLATE_DMG}"
 mkdir -p "$WC_DIR"
 
 hdiutil attach "$WC_DMG" -noautoopen -quiet -mountpoint "$WC_DIR"
-for i in $SOURCE_FILES; do
+for i in "${SOURCE_FILES[@]}" ; do
 	base=`basename $i`
 	rm -rf "$WC_DIR/$base"
 	ditto -rsrc "$i" "$WC_DIR/$base"
 done
 #rm -f "$@"
 #hdiutil create -srcfolder "$(WC_DIR)" -format UDZO -imagekey zlib-level=9 "$@" -volname "$(NAME) $(VERSION)" -scrub -quiet
 WC_DEV=`hdiutil info | grep "$WC_DIR" | grep "Apple_HFS" | awk '{print $1}'` && \
-	hdiutil detach $WC_DEV -quiet -force
+	hdiutil detach "$WC_DEV" -quiet -force
 rm -f "$MASTER_DMG"
 hdiutil convert "$WC_DMG" -quiet -format UDZO -imagekey zlib-level=9 -o "$MASTER_DMG"
 rm -rf "$WC_DIR"

diff --git a/Scripts/sign_applescript.bash b/Scripts/sign_applescript.bash
@@ -6,7 +6,7 @@
 #  Created by Brian Olsen on 09/03/2020.
 #
 #set -o errexit
-# set -x
+set -x
 
 if [ "$CODE_SIGNING_ALLOWED" == "YES" ]; then
     counter=0