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.

diff --git a/scripts/ci/common.sh b/scripts/ci/common.sh
index a1e97c6064fe992814a95ac26f450aaf0af80b7c..adb8d56d808b52b49b1b00b8b87cd8c174bf27e5 100755 (executable)
--- 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.$$