From 08e6f473111422b511bdac241edde9e7c7496628 Mon Sep 17 00:00:00 2001 From: malte_langkabel Date: Wed, 24 Feb 2016 19:46:39 +0100 Subject: [PATCH] build: Fixed version number for Windows deploy script --- script/deploy_windows.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/script/deploy_windows.sh b/script/deploy_windows.sh index a11be31b..21b759af 100644 --- a/script/deploy_windows.sh +++ b/script/deploy_windows.sh @@ -1,6 +1,6 @@ # FLAGS -REBUILD=false -OBFUSCATE=false +REBUILD=true +OBFUSCATE=true # USEFUL VARIABLES @@ -15,6 +15,7 @@ BASE_DIR=`dirname "$CLEANED_PATH_TO_SCRIPT"` cd $BASE_DIR/.. + if [ $REBUILD = false ]; then echo -e "$INFO REBUILD flag is set to false. Do you want to proceed?" read -p "Press [Enter] key to continue" @@ -99,7 +100,7 @@ echo -e "$INFO building the installer (trail)" # CREATING PACKAGE FOLDERS (APP) -VERSION_STRING=$(git describe) +VERSION_STRING=$(git describe --long) VERSION_STRING="${VERSION_STRING//-/_}" VERSION_STRING="${VERSION_STRING//./_}" VERSION_STRING="${VERSION_STRING%_*}" @@ -136,7 +137,7 @@ rm -rf $APP_PACKAGE_DIR # CREATING PACKAGE FOLDERS (TRIAL) -TRIAL_PACKAGE_NAME=Coati_Trail_${VERSION_STRING} +TRIAL_PACKAGE_NAME=Coati_Trial_${VERSION_STRING} TRIAL_PACKAGE_DIR=release/$TRIAL_PACKAGE_NAME