From 87aa3fbfe8c015e039ca181b2b83d7873cf265e7 Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Mon, 29 Mar 2021 15:37:25 +0200
Subject: [PATCH] :sparkles: Improve version handling.

---
 manage.sh   | 23 ++++++++++++-----------
 version.txt |  1 +
 2 files changed, 13 insertions(+), 11 deletions(-)
 create mode 100644 version.txt

diff --git a/manage.sh b/manage.sh
index 01631cd7ac..b1e2546dc1 100755
--- a/manage.sh
+++ b/manage.sh
@@ -6,9 +6,18 @@ export DEVENV_IMGNAME="$ORGANIZATION/devenv";
 export DEVENV_PNAME="penpotdev";
 
 export CURRENT_USER_ID=$(id -u);
-export CURRENT_VERSION=$(git describe --tags);
+export CURRENT_VERSION=$(cat ./version.txt);
 export CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD);
 export CURRENT_HASH=$(git rev-parse --short HEAD);
+export CURRENT_COMMITS=$(git rev-list --count HEAD)
+
+function print-current-version {
+    if [ $CURRENT_BRANCH != "main" ]; then
+        echo -n "$CURRENT_BRANCH-$CURRENT_VERSION-$CURRENT_COMMITS-g$CURRENT_HASH"
+    else
+        echo -n "$CURRENT_VERSION-$CURRENT_COMMITS-g$CURRENT_HASH"
+    fi
+}
 
 function build-devenv {
     echo "Building development image $DEVENV_IMGNAME:latest..."
@@ -74,7 +83,7 @@ function build {
 }
 
 function build-app-bundle {
-    local version="$CURRENT_VERSION";
+    local version=$(print-current-version);
     local bundle_dir="./bundle-app";
 
     build "frontend";
@@ -85,10 +94,6 @@ function build-app-bundle {
     cp -r ./frontend/target/dist $bundle_dir/frontend;
     cp -r ./backend/target/dist $bundle_dir/backend;
 
-    if [ $CURRENT_BRANCH != "main" ]; then
-        version="$CURRENT_BRANCH-$CURRENT_VERSION";
-    fi;
-
     echo $version > $bundle_dir/version.txt
 
     sed -i -re "s/\%version\%/$version/g" $bundle_dir/frontend/index.html;
@@ -96,7 +101,7 @@ function build-app-bundle {
 }
 
 function build-exporter-bundle {
-    local version="$CURRENT_VERSION";
+    local version=$(print-current-version);
     local bundle_dir="./bundle-exporter";
 
     build "exporter";
@@ -104,10 +109,6 @@ function build-exporter-bundle {
     rm -rf $bundle_dir;
     cp -r ./exporter/target $bundle_dir;
 
-    if [ $CURRENT_BRANCH != "main" ]; then
-        version="$CURRENT_BRANCH-$CURRENT_VERSION";
-    fi;
-
     echo $version > $bundle_dir/version.txt
 }
 
diff --git a/version.txt b/version.txt
new file mode 100644
index 0000000000..06c33719e1
--- /dev/null
+++ b/version.txt
@@ -0,0 +1 @@
+1.4.0-alpha