From d6db80c9369507754e95533751b3a531b47cd87e Mon Sep 17 00:00:00 2001 From: Markus Seeber Date: Wed, 15 Oct 2014 22:45:00 +0200 Subject: [PATCH] fix bug on building under path with whitespaces - wrapping the path strings in quotes prevents interpretation as multiple files or paths if there are whitespaces in the path. --- svnversion_regenerate.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/svnversion_regenerate.sh b/svnversion_regenerate.sh index f98f977e..86af931c 100755 --- a/svnversion_regenerate.sh +++ b/svnversion_regenerate.sh @@ -13,8 +13,8 @@ TEMP_FILE="${OUTPUT_FILE}.tmp" #echo svnversion... #pwd -#echo $OUTPUT_FILE -#echo $TEMP_FILE +#echo "$OUTPUT_FILE" +#echo "$TEMP_FILE" OLDPWD=`pwd` cd .. @@ -49,22 +49,22 @@ then REV="unknown" fi -echo "#define ${DEFINE} \"${REV}\"" > ${TEMP_FILE} -if test ! -f ${OUTPUT_FILE} +echo "#define ${DEFINE} \"${REV}\"" > "${TEMP_FILE}" +if test ! -f "${OUTPUT_FILE}" then echo "Generated ${OUTPUT_FILE} (${REV})" - cp ${TEMP_FILE} ${OUTPUT_FILE} + cp "${TEMP_FILE}" "${OUTPUT_FILE}" if test $? -ne 0; then exit 1; fi else - if ! cmp -s ${OUTPUT_FILE} ${TEMP_FILE} + if ! cmp -s "${OUTPUT_FILE}" "${TEMP_FILE}" then echo "Regenerated ${OUTPUT_FILE} (${REV})" - cp ${TEMP_FILE} ${OUTPUT_FILE} + cp "${TEMP_FILE}" "${OUTPUT_FILE}" if test $? -ne 0; then exit 1; fi fi fi cd "${OLDPWD}" -rm ${TEMP_FILE} +rm "${TEMP_FILE}" exit $?