MT#6253 Fix script version usage

11 years ago · 20361911fa
parent db3bbb7bd8
commit 20361911fa
2 changed files with 2 additions and 1 deletions
--- a/1
+++ b/1
@ -25,6 +25,7 @@ clean:
 	rm -f templates/boot/grub/sipwise_latest.cfg templates/boot/grub/sipwise_lts.cfg \
 	  templates/boot/isolinux/sipwise_latest.cfg templates/boot/isolinux/sipwise_lts.cfg
 	rm -f templates/boot/isolinux/syslinux.cfg
+	sed -i 's/^SCRIPT_VERSION=.*/SCRIPT_VERSION="%SCRIPT_VERSION%"/' ./templates-ce/scripts/includes/deployment.sh

 dist-clean: clean
 	rm -rf artifacts
--- a/templates-ce/scripts/includes/deployment.sh
+++ b/templates-ce/scripts/includes/deployment.sh
@ -7,7 +7,7 @@ exec  > >(tee -a $INSTALL_LOG    )
 exec 2> >(tee -a $INSTALL_LOG >&2)

 # set version to git commit ID
-SCRIPT_VERSION=45bf9f2
+SCRIPT_VERSION="%SCRIPT_VERSION%"

 # not set? then fall back to timestamp of execution
 if [ -z "$SCRIPT_VERSION" ] || [ "$SCRIPT_VERSION" = '%SCRIPT_VERSION%' ] ; then