From 3144842696dbddb7af607683622826a776a3ae81 Mon Sep 17 00:00:00 2001 From: Thomas Berezansky Date: Sat, 21 May 2011 10:28:02 -0400 Subject: [PATCH] Two-piece version, adj. replace in Application.pm Signed-off-by: Thomas Berezansky --- build/tools/apply_version.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/tools/apply_version.sh b/build/tools/apply_version.sh index df766f8bde..bb2e9b4b6f 100755 --- a/build/tools/apply_version.sh +++ b/build/tools/apply_version.sh @@ -13,6 +13,7 @@ if [ $VERSION = "AUTO" ]; then VERSION=`echo $GIT_BRANCH | sed 's/^rel_\([0-9]\+\)_\([0-9]\+\)_\([0-9]\+\)_\(.\+\)$/\1.\2.\3-\4/'` VERSION=`echo $VERSION | sed 's/^rel_\([0-9]\+\)_\([0-9]\+\)_\([0-9]\+\)$/\1.\2.\3/'` VERSION=`echo $VERSION | sed 's/^rel_\([0-9]\+\)_\([0-9]\+\)_\(.\+\)$/\1.\2-\3/'` + VERSION=`echo $VERSION | sed 's/^rel_\([0-9]\+\)_\([0-9]\+\)/\1.\2/'` if [ "$VERSION" = "$GIT_BRANCH" ]; then echo "AUTO VERSION FAILED." exit 1 @@ -28,7 +29,7 @@ UNDER_VERSION=`echo $VERSION | sed -e 's/\./_/g' -e 's/-/_/g'` echo "Applying to Application.pm - HEAD -> $DASH_VERSION" echo "Alt: $SHORT_DASH_VERSION -> $DASH_VERSION" -sed -i -e "s/$SHORT_DASH_VERSION/$DASH_VERSION/" -e "s/HEAD/$DASH_VERSION/" $GIT_ABS/Open-ILS/src/perlmods/lib/OpenILS/Application.pm +sed -i -e "s/\"$SHORT_DASH_VERSION[^\"]*\"/\"$DASH_VERSION\"/" -e "s/\"HEAD\"/\"$DASH_VERSION\"/" $GIT_ABS/Open-ILS/src/perlmods/lib/OpenILS/Application.pm echo "Applying to windowssetup.nsi - Master -> $SHORT_VERSION" sed -i "s/Master/$SHORT_VERSION/" $GIT_ABS/Open-ILS/xul/staff_client/windowssetup.nsi -- 2.11.0