|
@@ -11,9 +11,9 @@ version=$1
|
|
|
versionfile="${MY_DIR}/versions/${version}"
|
|
|
[ -r $versionfile ] || abort "Failed to find the version '$version'."
|
|
|
|
|
|
-base=`awk 'BEGIN { FS="=" } /^GLUON=([a-f0-9]+)$/ { print $2; }' $versionfile`
|
|
|
+base=`awk 'BEGIN { FS="=" } /^GLUON=([a-f0-9]+)(\s*#.+)?$/ { print $2; }' $versionfile | awk 'BEGIN { FS="#" } { print $1; }'`
|
|
|
branch=`awk 'BEGIN { FS="=" } /^BRANCH=([a-z]+)$/ { print $2; }' $versionfile`
|
|
|
-site=`awk 'BEGIN { FS="=" } /^SITE=([a-f0-9]+)$/ { print $2; }' $versionfile`
|
|
|
+site=`awk 'BEGIN { FS="=" } /^SITE=([a-f0-9]+)(\s*#.+)?$/ { print $2; }' $versionfile | awk 'BEGIN { FS="#" } { print $1; }'`
|
|
|
ts=`awk 'BEGIN { FS="=" } /^TS=.+$/ { print $2; }' $versionfile`
|
|
|
|
|
|
[ -z "$base" ] && abort "Failed to parse Gluon base commit-id from version file."
|
|
@@ -21,7 +21,11 @@ ts=`awk 'BEGIN { FS="=" } /^TS=.+$/ { print $2; }' $versionfile`
|
|
|
[ -z "$site" ] && abort "Failed to parse site repo commit-id from version file."
|
|
|
[ -z "$ts" ] && abort "Failed to parse timestamp from version file."
|
|
|
|
|
|
-info Building $branch version '$version' again ...
|
|
|
+# remove all spaces from git-commit-ids
|
|
|
+base="${base// /}"
|
|
|
+site="${site// /}"
|
|
|
+
|
|
|
+info "Building $branch version '$version' again ..."
|
|
|
echo " * Gluon base = $base"
|
|
|
echo " * Site repo = $site"
|
|
|
echo " * Timestamp = $ts"
|