build: Cope with spaces in filenames when creating/applying OSX sigs

This commit is contained in:
Cory Fields 2015-05-15 17:54:20 -04:00 committed by Jonas Schnelli
parent 7cef321e65
commit d1a3866e0b
2 changed files with 21 additions and 22 deletions

View File

@ -1,11 +1,10 @@
#!/bin/sh #!/bin/sh
set -e set -e
UNSIGNED=$1 UNSIGNED="$1"
SIGNATURE=$2 SIGNATURE="$2"
ARCH=x86_64 ARCH=x86_64
ROOTDIR=dist ROOTDIR=dist
BUNDLE=${ROOTDIR}/Bitcoin-Core.app
TEMPDIR=signed.temp TEMPDIR=signed.temp
OUTDIR=signed-app OUTDIR=signed-app
@ -31,21 +30,21 @@ if [ -z "${CODESIGN_ALLOCATE}" ]; then
CODESIGN_ALLOCATE=${TEMPDIR}/codesign_allocate CODESIGN_ALLOCATE=${TEMPDIR}/codesign_allocate
fi fi
for i in `find ${TEMPDIR} -name "*.sign"`; do find ${TEMPDIR} -name "*.sign" | while read i; do
SIZE=`stat -c %s ${i}` SIZE=`stat -c %s "${i}"`
TARGET_FILE=`echo ${i} | sed 's/\.sign$//'` TARGET_FILE="`echo "${i}" | sed 's/\.sign$//'`"
echo "Allocating space for the signature of size ${SIZE} in ${TARGET_FILE}" 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 if [ -z ${QUIET} ]; then
echo "Attaching signature at offset ${OFFSET}" echo "Attaching signature at offset ${OFFSET}"
fi fi
dd if=$i of=${i}.tmp bs=1 seek=${OFFSET} count=${SIZE} 2>/dev/null dd if="$i" of="${i}.tmp" bs=1 seek=${OFFSET} count=${SIZE} 2>/dev/null
mv ${i}.tmp ${TARGET_FILE} mv "${i}.tmp" "${TARGET_FILE}"
rm ${i} rm "${i}"
echo "Success." echo "Success."
done done
mv ${TEMPDIR}/${ROOTDIR} ${OUTDIR} mv ${TEMPDIR}/${ROOTDIR} ${OUTDIR}

View File

@ -2,7 +2,7 @@
set -e set -e
ROOTDIR=dist ROOTDIR=dist
BUNDLE=${ROOTDIR}/Bitcoin-Core.app BUNDLE="${ROOTDIR}/Bitcoin Core.app"
CODESIGN=codesign CODESIGN=codesign
TEMPDIR=sign.temp TEMPDIR=sign.temp
TEMPLIST=${TEMPDIR}/signatures.txt TEMPLIST=${TEMPDIR}/signatures.txt
@ -19,19 +19,19 @@ mkdir -p ${TEMPDIR}
${CODESIGN} -f --file-list ${TEMPLIST} "$@" "${BUNDLE}" ${CODESIGN} -f --file-list ${TEMPLIST} "$@" "${BUNDLE}"
for i in `grep -v CodeResources ${TEMPLIST}`; do grep -v CodeResources < "${TEMPLIST}" | while read i; do
TARGETFILE="${BUNDLE}/`echo ${i} | sed "s|.*${BUNDLE}/||"`" TARGETFILE="${BUNDLE}/`echo "${i}" | sed "s|.*${BUNDLE}/||"`"
SIZE=`pagestuff $i -p | tail -2 | grep size | sed 's/[^0-9]*//g'` 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'` OFFSET=`pagestuff "$i" -p | tail -2 | grep offset | sed 's/[^0-9]*//g'`
SIGNFILE="${TEMPDIR}/${TARGETFILE}.sign" SIGNFILE="${TEMPDIR}/${TARGETFILE}.sign"
DIRNAME="`dirname ${SIGNFILE}`" DIRNAME="`dirname "${SIGNFILE}"`"
mkdir -p "${DIRNAME}" mkdir -p "${DIRNAME}"
echo "Adding detached signature for: ${TARGETFILE}. Size: ${SIZE}. Offset: ${OFFSET}" 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 done
for i in `grep CodeResources ${TEMPLIST}`; do grep CodeResources < "${TEMPLIST}" | while read i; do
TARGETFILE="${BUNDLE}/`echo ${i} | sed "s|.*${BUNDLE}/||"`" TARGETFILE="${BUNDLE}/`echo "${i}" | sed "s|.*${BUNDLE}/||"`"
RESOURCE="${TEMPDIR}/${TARGETFILE}" RESOURCE="${TEMPDIR}/${TARGETFILE}"
DIRNAME="`dirname "${RESOURCE}"`" DIRNAME="`dirname "${RESOURCE}"`"
mkdir -p "${DIRNAME}" mkdir -p "${DIRNAME}"
@ -41,6 +41,6 @@ done
rm ${TEMPLIST} rm ${TEMPLIST}
tar -C ${TEMPDIR} -czf ${OUT} . tar -C "${TEMPDIR}" -czf "${OUT}" .
rm -rf ${TEMPDIR} rm -rf "${TEMPDIR}"
echo "Created ${OUT}" echo "Created ${OUT}"