Merge pull request #5 from DRITE/fix/incrementation-preversion

Fix incrementation of alpha, beta and rc `preversion` variable in cases if there are `pre` already.
christian-draeger · Jul 12, 2020 · 9d04121 · 9d04121
2 parents 721021b + 2e460ae
commit 9d04121
Showing 1 changed file with 27 additions and 18 deletions.
diff --git a/entrypoint.sh b/entrypoint.sh
@@ -47,30 +47,39 @@ main() {
   "bug")
     ((++patch)); pre="";;
   "alpha")
-    if [[ ! -z "$preversion" ]]; then
-      preversion=0
-    fi
-    ((++preversion))
-    if [[ "$pre" != "-alpha" ]]; then
-      preversion=1
+    if [[ -z "$preversion" ]];
+      then
+        preversion=0
+      else
+        if [[ "$pre" != "-alpha" ]];
+          then
+          preversion=1
+          else ((++preversion))
+        fi
     fi
     pre="-alpha$preversion";;
   "beta")
-    if [[ ! -z "$preversion" ]]; then
-      preversion=0
-    fi
-    ((++preversion))
-    if [[ "$pre" != "-beta" ]]; then
-      preversion=1
+    if [[ -z "$preversion" ]];
+      then
+        preversion=0
+      else
+        if [[ "$pre" != "-beta" ]];
+          then
+          preversion=1
+          else ((++preversion))
+        fi
     fi
     pre="-beta$preversion";;
   "rc")
-    if [[ ! -z "$preversion" ]]; then
-      preversion=0
-    fi
-    ((++preversion))
-    if [[ "$pre" != "-rc" ]]; then
-      preversion=1
+    if [[ -z "$preversion" ]];
+      then
+        preversion=0
+      else
+        if [[ "$pre" != "-rc" ]];
+          then
+          preversion=1
+          else ((++preversion))
+        fi
     fi
     pre="-rc$preversion";;
   esac