kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
This commit is contained in:
Travis Cross 2013-12-07 21:14:26 +00:00
parent d2f892fe67
commit a5d007816d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/ci/common.sh
View File

@ -108,7 +108,7 @@ set_fs_ver () {
if [ -n "$rev" ]; then if [ -n "$rev" ]; then
[ -n "$hrev" ] || hrev="$rev" [ -n "$hrev" ] || hrev="$rev"
sed -e "s|\(AC_SUBST(SWITCH_VERSION_REVISION, \[\).*\(\])\)|\1$rev\2|" \ 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\)|\1|" \
-e "s|#\(AC_SUBST(SWITCH_VERSION_REVISION_HUMAN\)|\1|" \ -e "s|#\(AC_SUBST(SWITCH_VERSION_REVISION_HUMAN\)|\1|" \
configure.in > configure.in.$$ configure.in > configure.in.$$