set develop build as 2.4.x release

fusioninventory · Oct 4, 2018 · 233e5b3 · 233e5b3
1 parent 41b6392
commit 233e5b3
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 15 deletions.
diff --git a/NSIS/FusionInventory-Agent.sh b/NSIS/FusionInventory-Agent.sh
@@ -130,20 +130,18 @@ else
 fi
 option_nsis_define="$option_nsis_define -DFIA_RELEASE=${fusinv_agent_release}"
 
-if [ -z "${fusinv_agent_release##*.*.*}" ]; then
-    read MAJOR MINOR SUB <<<"${fusinv_agent_release//./ }"
-    if [ -n "${MAJOR}" ]; then
-       option_nsis_define="$option_nsis_define -DFIA_MAJOR=${MAJOR}"
-    else
-       echo "ERROR: Can't read MAJOR version number" >&2
-       exit 1
-    fi
-    if [ -n "${MINOR}" ]; then
-       option_nsis_define="$option_nsis_define -DFIA_MINOR=${MINOR%%-*}"
-    else
-       echo "ERROR: Can't read MINOR version number" >&2
-       exit 1
-    fi
+read MAJOR MINOR SUB <<<"${fusinv_agent_release//./ }"
+if [ -n "${MAJOR}" ]; then
+   option_nsis_define="$option_nsis_define -DFIA_MAJOR=${MAJOR}"
+else
+   echo "ERROR: Can't read MAJOR version number" >&2
+   exit 1
+fi
+if [ -n "${MINOR}" ]; then
+   option_nsis_define="$option_nsis_define -DFIA_MINOR=${MINOR%%-*}"
+else
+   echo "ERROR: Can't read MINOR version number" >&2
+   exit 1
 fi
 
 # Support numbering with empty or 'x' SUB as zero sub

diff --git a/Perl/Scripts/load-perl-environment b/Perl/Scripts/load-perl-environment
@@ -72,7 +72,7 @@ if [ -n "${APPVEYOR_REPO_TAG_NAME}" ]; then
    declare -r fusinv_agent_release="${APPVEYOR_REPO_TAG_NAME}"
 elif [ -n "${APPVEYOR_REPO_BRANCH}" ]; then
    declare -r fusinv_agent_commit="develop"
-   declare -r fusinv_agent_release="develop"
+   declare -r fusinv_agent_release="2.4.x"
    declare -r TYPE="development"
 elif [ -n "${FIA_RELEASE}" ]; then
    declare -r fusinv_agent_release="${FIA_RELEASE}"