From d1a3866e0b31711b4ba093ae75d0e99a34007b15 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Fri, 15 May 2015 17:54:20 -0400
Subject: [PATCH] build: Cope with spaces in filenames when creating/applying
 OSX sigs

---
 contrib/macdeploy/detached-sig-apply.sh  | 21 ++++++++++-----------
 contrib/macdeploy/detached-sig-create.sh | 22 +++++++++++-----------
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/contrib/macdeploy/detached-sig-apply.sh b/contrib/macdeploy/detached-sig-apply.sh
index c68d85708..169f69043 100755
--- a/contrib/macdeploy/detached-sig-apply.sh
+++ b/contrib/macdeploy/detached-sig-apply.sh
@@ -1,11 +1,10 @@
 #!/bin/sh
 set -e
 
-UNSIGNED=$1
-SIGNATURE=$2
+UNSIGNED="$1"
+SIGNATURE="$2"
 ARCH=x86_64
 ROOTDIR=dist
-BUNDLE=${ROOTDIR}/Bitcoin-Core.app
 TEMPDIR=signed.temp
 OUTDIR=signed-app
 
@@ -31,21 +30,21 @@ if [ -z "${CODESIGN_ALLOCATE}" ]; then
   CODESIGN_ALLOCATE=${TEMPDIR}/codesign_allocate
 fi
 
-for i in `find ${TEMPDIR} -name "*.sign"`; do
-  SIZE=`stat -c %s ${i}`
-  TARGET_FILE=`echo ${i} | sed 's/\.sign$//'`
+find ${TEMPDIR} -name "*.sign" | while read i; do
+  SIZE=`stat -c %s "${i}"`
+  TARGET_FILE="`echo "${i}" | sed 's/\.sign$//'`"
 
   echo "Allocating space for the signature of size ${SIZE} in ${TARGET_FILE}"
-  ${CODESIGN_ALLOCATE} -i ${TARGET_FILE} -a ${ARCH} ${SIZE} -o ${i}.tmp
+  ${CODESIGN_ALLOCATE} -i "${TARGET_FILE}" -a ${ARCH} ${SIZE} -o "${i}.tmp"
 
-  OFFSET=`${PAGESTUFF} ${i}.tmp -p | tail -2 | grep offset | sed 's/[^0-9]*//g'`
+  OFFSET=`${PAGESTUFF} "${i}.tmp" -p | tail -2 | grep offset | sed 's/[^0-9]*//g'`
   if [ -z ${QUIET} ]; then
     echo "Attaching signature at offset ${OFFSET}"
   fi
 
-  dd if=$i of=${i}.tmp bs=1 seek=${OFFSET} count=${SIZE} 2>/dev/null
-  mv ${i}.tmp ${TARGET_FILE}
-  rm ${i}
+  dd if="$i" of="${i}.tmp" bs=1 seek=${OFFSET} count=${SIZE} 2>/dev/null
+  mv "${i}.tmp" "${TARGET_FILE}"
+  rm "${i}"
   echo "Success."
 done
 mv ${TEMPDIR}/${ROOTDIR} ${OUTDIR}
diff --git a/contrib/macdeploy/detached-sig-create.sh b/contrib/macdeploy/detached-sig-create.sh
index ba9932bcf..fd7314bd7 100755
--- a/contrib/macdeploy/detached-sig-create.sh
+++ b/contrib/macdeploy/detached-sig-create.sh
@@ -2,7 +2,7 @@
 set -e
 
 ROOTDIR=dist
-BUNDLE=${ROOTDIR}/Bitcoin-Core.app
+BUNDLE="${ROOTDIR}/Bitcoin Core.app"
 CODESIGN=codesign
 TEMPDIR=sign.temp
 TEMPLIST=${TEMPDIR}/signatures.txt
@@ -19,19 +19,19 @@ mkdir -p ${TEMPDIR}
 
 ${CODESIGN} -f --file-list ${TEMPLIST} "$@" "${BUNDLE}"
 
-for i in `grep -v CodeResources ${TEMPLIST}`; do
-  TARGETFILE="${BUNDLE}/`echo ${i} | sed "s|.*${BUNDLE}/||"`"
-  SIZE=`pagestuff $i -p | tail -2 | grep size | sed 's/[^0-9]*//g'`
-  OFFSET=`pagestuff $i -p | tail -2 | grep offset | sed 's/[^0-9]*//g'`
+grep -v CodeResources < "${TEMPLIST}" | while read i; do
+  TARGETFILE="${BUNDLE}/`echo "${i}" | sed "s|.*${BUNDLE}/||"`"
+  SIZE=`pagestuff "$i" -p | tail -2 | grep size | sed 's/[^0-9]*//g'`
+  OFFSET=`pagestuff "$i" -p | tail -2 | grep offset | sed 's/[^0-9]*//g'`
   SIGNFILE="${TEMPDIR}/${TARGETFILE}.sign"
-  DIRNAME="`dirname ${SIGNFILE}`"
+  DIRNAME="`dirname "${SIGNFILE}"`"
   mkdir -p "${DIRNAME}"
   echo "Adding detached signature for: ${TARGETFILE}. Size: ${SIZE}. Offset: ${OFFSET}"
-  dd if=$i of=${SIGNFILE} bs=1 skip=${OFFSET} count=${SIZE} 2>/dev/null
+  dd if="$i" of="${SIGNFILE}" bs=1 skip=${OFFSET} count=${SIZE} 2>/dev/null
 done
 
-for i in `grep CodeResources ${TEMPLIST}`; do
-  TARGETFILE="${BUNDLE}/`echo ${i} | sed "s|.*${BUNDLE}/||"`"
+grep CodeResources < "${TEMPLIST}" | while read i; do
+  TARGETFILE="${BUNDLE}/`echo "${i}" | sed "s|.*${BUNDLE}/||"`"
   RESOURCE="${TEMPDIR}/${TARGETFILE}"
   DIRNAME="`dirname "${RESOURCE}"`"
   mkdir -p "${DIRNAME}"
@@ -41,6 +41,6 @@ done
 
 rm ${TEMPLIST}
 
-tar -C ${TEMPDIR} -czf ${OUT} .
-rm -rf ${TEMPDIR}
+tar -C "${TEMPDIR}" -czf "${OUT}" .
+rm -rf "${TEMPDIR}"
 echo "Created ${OUT}"