From a5d007816d64b456a1a9d9d3fa56b5909bbba787 Mon Sep 17 00:00:00 2001 From: Travis Cross Date: Sat, 7 Dec 2013 21:14:26 +0000 Subject: [PATCH] Deal correctly with spaces in SWITCH_VERSION_REVISION_HUMAN This affects the set_fs_ver bash function and the ./build/set-fs-version.sh script. Previously we were failing to quote the value of SWITCH_VERSION_REVISION_HUMAN when inserting it into configure.in. When it contains spaces, which it often does, this results in a malformed line in the generated configure script, which results in the define in src/include/switch_version.h.in being left unset. --- scripts/ci/common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/common.sh b/scripts/ci/common.sh index a1e97c6064..adb8d56d80 100755 --- a/scripts/ci/common.sh +++ b/scripts/ci/common.sh @@ -108,7 +108,7 @@ set_fs_ver () { if [ -n "$rev" ]; then [ -n "$hrev" ] || hrev="$rev" sed -e "s|\(AC_SUBST(SWITCH_VERSION_REVISION, \[\).*\(\])\)|\1$rev\2|" \ - -e "s|\(AC_SUBST(SWITCH_VERSION_REVISION_HUMAN, \[\).*\(\])\)|\1$hrev\2|" \ + -e "s|\(AC_SUBST(SWITCH_VERSION_REVISION_HUMAN, \[\).*\(\])\)|\1'$hrev'\2|" \ -e "s|#\(AC_SUBST(SWITCH_VERSION_REVISION\)|\1|" \ -e "s|#\(AC_SUBST(SWITCH_VERSION_REVISION_HUMAN\)|\1|" \ configure.in > configure.in.$$