#427: keep leading zeros (#436)

devonfw · Jul 30, 2020 · 0f31c00 · 0f31c00
1 parent b98e314
commit 0f31c00
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 2 deletions.
diff --git a/scripts/src/main/resources/scripts/functions b/scripts/src/main/resources/scripts/functions
@@ -1084,6 +1084,7 @@ function doGetNextVersion() {
   local version="${1}"
   local suffix="${version##*[0-9]}"
   local prefix=""
+  local last=""
   local next=""
   local begin="${version:0:(${#version}-${#suffix})}"
   if [ -n "${begin}" ]
@@ -1098,8 +1099,13 @@ function doGetNextVersion() {
       fi
     done
     prefix="${begin:0:(${i})}"
-    next="${begin:(${i}):(${#begin}-${i})}"
-    next=$((next+1))
+    last="${begin:(${i}):(${#begin}-${i})}"
+    next=$((last+1))
+    # https://github.com/devonfw/ide/issues/427
+    if [ "${#last}" -gt "${#next}" ]
+    then
+      next="${last:0:(${#last}-${#next})}${next}"
+    fi
   fi
   echo "${prefix}${next}${suffix}"
 }

diff --git a/scripts/src/test/bash/test-get-next-version b/scripts/src/test/bash/test-get-next-version
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+cd ../../../../scripts/src/main/resources || exit 1
+exitcode=0
+source scripts/functions
+echo "Testing getNextVersion"
+function doTestGetNextVersion() {
+  result=$(doGetNextVersion "${1}")
+  status="OK"
+  if [ "${result}" != "${2}" ]
+  then
+    status="NOK - was ${result}"
+  fi
+  echo "doGetNextVersion ${1} == ${2} ? ${status}"
+}
+doTestGetNextVersion 3.0.0-beta8 3.0.0-beta9
+doTestGetNextVersion 3.0.0-beta01 3.0.0-beta02
+doTestGetNextVersion 3.0.0-beta9 3.0.0-beta10
+doTestGetNextVersion 2020.04.01 2020.04.02
+doTestGetNextVersion 2020.04.001 2020.04.002
+
+exit "${exitcode}"