From 91875d7a532c722c7a9b4e828f12d3b45b8d40ad Mon Sep 17 00:00:00 2001
From: Ivan Mahonin <bh@icystar.com>
Date: Aug 09 2017 02:49:02 +0000
Subject: Rules for naming of publishing packages


---

diff --git a/build-opentoonz-testing.sh b/build-opentoonz-testing.sh
index 51fd510..0d2ccc7 100755
--- a/build-opentoonz-testing.sh
+++ b/build-opentoonz-testing.sh
@@ -10,6 +10,9 @@ CONFIG_FILE="$BASE_DIR/config.sh"
 PACKET_BUILD_DIR="$BUILD_DIR/packet"
 SCRIPT_BUILD_DIR="$BUILD_DIR/script"
 OPENTOONZ_TESTING_TAG="testing"
+
+source "$BASE_DIR/gen-name.sh"
+
 if [ -f $CONFIG_FILE ]; then
 	source $CONFIG_FILE
 fi
@@ -26,9 +29,10 @@ run_appimage() {
     $SCRIPT update opentoonz-testing
     $SCRIPT clean_before_do install_release opentoonz-testingappimage
 
+    local TEMPLATE=`gen_name_template "OpenToonz" "$OPENTOONZ_TESTING_TAG" "$PLATFORM" "$ARCH" ".appimage"`
     "$PUBLISH_DIR/publish.sh" \
         "opentoonz-testing" \
-        "OpenToonz-%VERSION%-$OPENTOONZ_TESTING_TAG-%DATE%-%COMMIT%-$PLATFORM-${ARCH}bit.appimage" \
+        "$TEMPLATE" \
         "$PACKET_BUILD_DIR/$PLATFORM-$ARCH/opentoonz-testingappimage/install_release" \
         "*.appimage" \
         "$PACKET_BUILD_DIR/$PLATFORM-$ARCH/opentoonz-testingappimage/envdeps_release/version-opentoonz-testing"
@@ -44,9 +48,10 @@ run_nsis() {
     $SCRIPT update opentoonz-testing
     $SCRIPT clean_before_do install_release opentoonz-testingnsis
 
+    local TEMPLATE=`gen_name_template "OpenToonz" "$OPENTOONZ_TESTING_TAG" "$PLATFORM" "$ARCH" ".exe"`
     "$PUBLISH_DIR/publish.sh" \
         "opentoonz-testing" \
-        "OpenToonz-%VERSION%-$OPENTOONZ_TESTING_TAG-%DATE%-%COMMIT%-$PLATFORM-${ARCH}bit.exe" \
+        "$TEMPLATE" \
         "$PACKET_BUILD_DIR/$PLATFORM-$ARCH/opentoonz-testingnsis/install_release" \
         "*.exe" \
         "$PACKET_BUILD_DIR/$PLATFORM-$ARCH/opentoonz-testingnsis/envdeps_release/version-opentoonz-testing"
diff --git a/build-opentoonz.sh b/build-opentoonz.sh
index 2fdd14d..8a2502a 100755
--- a/build-opentoonz.sh
+++ b/build-opentoonz.sh
@@ -9,6 +9,9 @@ PUBLISH_DIR=$BASE_DIR/publish
 CONFIG_FILE="$BASE_DIR/config.sh"
 PACKET_BUILD_DIR="$BUILD_DIR/packet"
 SCRIPT_BUILD_DIR="$BUILD_DIR/script"
+
+source "$BASE_DIR/gen-name.sh"
+
 if [ -f $CONFIG_FILE ]; then
 	source $CONFIG_FILE
 fi
@@ -25,9 +28,10 @@ run_appimage() {
     $SCRIPT update opentoonz-master
     $SCRIPT clean_before_do install_release opentoonz-appimage
 
+    local TEMPLATE=`gen_name_template "OpenToonz" "" "$PLATFORM" "$ARCH" ".appimage"`
     "$PUBLISH_DIR/publish.sh" \
         "opentoonz" \
-        "OpenToonz-%VERSION%-%DATE%-%COMMIT%-$PLATFORM-${ARCH}bit.appimage" \
+        "$TEMPLATE" \
         "$PACKET_BUILD_DIR/$PLATFORM-$ARCH/opentoonz-appimage/install_release" \
         "*.appimage" \
         "$PACKET_BUILD_DIR/$PLATFORM-$ARCH/opentoonz-appimage/envdeps_release/version-opentoonz-master"
@@ -43,9 +47,10 @@ run_nsis() {
     $SCRIPT update opentoonz-master
     $SCRIPT clean_before_do install_release opentoonz-nsis
 
+    local TEMPLATE=`gen_name_template "OpenToonz" "" "$PLATFORM" "$ARCH" ".exe"`
     "$PUBLISH_DIR/publish.sh" \
         "opentoonz" \
-        "OpenToonz-%VERSION%-%DATE%-%COMMIT%-$PLATFORM-${ARCH}bit.exe" \
+        "$TEMPLATE" \
         "$PACKET_BUILD_DIR/$PLATFORM-$ARCH/opentoonz-nsis/install_release" \
         "*.exe" \
         "$PACKET_BUILD_DIR/$PLATFORM-$ARCH/opentoonz-nsis/envdeps_release/version-opentoonz-master"
diff --git a/build-papagayong.sh b/build-papagayong.sh
index dd8dd21..8e069e0 100755
--- a/build-papagayong.sh
+++ b/build-papagayong.sh
@@ -9,6 +9,9 @@ PUBLISH_DIR=$BASE_DIR/publish
 CONFIG_FILE="$BASE_DIR/config.sh"
 PACKET_BUILD_DIR="$BUILD_DIR/packet"
 SCRIPT_BUILD_DIR="$BUILD_DIR/script"
+
+source "$BASE_DIR/gen-name.sh"
+
 if [ -f $CONFIG_FILE ]; then
 	source $CONFIG_FILE
 fi
@@ -25,9 +28,10 @@ run_appimage() {
     $SCRIPT update papagayong-testing
     $SCRIPT clean_before_do install_release papagayong-appimage
 
+    local TEMPLATE=`gen_name_template "PapagayoNG" "" "$PLATFORM" "$ARCH" ".appimage"`
     "$PUBLISH_DIR/publish.sh" \
         "papagayong" \
-        "PapagayoNG-%VERSION%-%DATE%-%COMMIT%-$PLATFORM-${ARCH}bit.appimage" \
+        "$TEMPLATE" \
         "$PACKET_BUILD_DIR/$PLATFORM-$ARCH/papagayong-appimage/install_release" \
         "*.appimage" \
         "$PACKET_BUILD_DIR/$PLATFORM-$ARCH/papagayong-appimage/envdeps_release/version-papagayong-testing"
@@ -46,9 +50,10 @@ run_nsis() {
     # QUICK HACK:
     $SCRIPT shell papagayong-testing "/build/script/packet/papagayong-testing.files/build-win.sh"
 
+    local TEMPLATE=`gen_name_template "PapagayoNG" "" "$PLATFORM" "$ARCH" ".exe"`
     "$PUBLISH_DIR/publish.sh" \
         "papagayong" \
-        "PapagayoNG-%VERSION%-%DATE%-%COMMIT%-$PLATFORM-${ARCH}bit.exe" \
+        "$TEMPLATE" \
         "$PACKET_BUILD_DIR/$PLATFORM-$ARCH/papagayong-testing/build" \
         "*.exe" \
         "$PACKET_BUILD_DIR/$PLATFORM-$ARCH/papagayong-testing/unpack/version-papagayong-testing"
diff --git a/build-synfigstudio.sh b/build-synfigstudio.sh
index 8154b88..6226431 100755
--- a/build-synfigstudio.sh
+++ b/build-synfigstudio.sh
@@ -9,6 +9,10 @@ PUBLISH_DIR=$BASE_DIR/publish
 CONFIG_FILE="$BASE_DIR/config.sh"
 PACKET_BUILD_DIR="$BUILD_DIR/packet"
 SCRIPT_BUILD_DIR="$BUILD_DIR/script"
+SYNFIGSTUDIO_TESTING_TAG="testing"
+
+source "$BASE_DIR/gen-name.sh"
+
 if [ -f $CONFIG_FILE ]; then
     source $CONFIG_FILE
 fi
@@ -27,9 +31,10 @@ run_appimage() {
     $SCRIPT update synfigstudio-master
     $SCRIPT clean_before_do install_release synfigstudio-appimage
 
+    local TEMPLATE=`gen_name_template "SynfigStudio" "$SYNFIGSTUDIO_TESTING_TAG" "$PLATFORM" "$ARCH" ".appimage"`
     "$PUBLISH_DIR/publish.sh" \
         "synfigstudio" \
-        "SynfigStudio-%VERSION%-%DATE%-%COMMIT%-$PLATFORM-${ARCH}bit.appimage" \
+        "$TEMPLATE" \
         "$PACKET_BUILD_DIR/$PLATFORM-$ARCH/synfigstudio-appimage/install_release" \
         "*.appimage" \
         "$PACKET_BUILD_DIR/$PLATFORM-$ARCH/synfigstudio-appimage/envdeps_release/version-synfigstudio-master"
@@ -47,9 +52,10 @@ run_nsis() {
     $SCRIPT update synfigstudio-master
     $SCRIPT clean_before_do install_release synfigstudio-nsis
 
+    local TEMPLATE=`gen_name_template "SynfigStudio" "$SYNFIGSTUDIO_TESTING_TAG" "$PLATFORM" "$ARCH" ".exe"`
     "$PUBLISH_DIR/publish.sh" \
         "synfigstudio" \
-        "SynfigStudio-%VERSION%-%DATE%-%COMMIT%-$PLATFORM-${ARCH}bit.exe" \
+        "$TEMPLATE" \
         "$PACKET_BUILD_DIR/$PLATFORM-$ARCH/synfigstudio-nsis/install_release" \
         "*.exe" \
         "$PACKET_BUILD_DIR/$PLATFORM-$ARCH/synfigstudio-nsis/envdeps_release/version-synfigstudio-master"
diff --git a/config.sh.blank b/config.sh.blank
index 1d23d40..1f883c0 100644
--- a/config.sh.blank
+++ b/config.sh.blank
@@ -4,9 +4,24 @@
 # DOCKER_RUN_OPTIONS="-e http_proxy=$PROXY -e https_proxy=$PROXY"
 
 # docker() {
-# 	export CHROOTER_PREFIX="/mnt"
-# 	$BASE_DIR/chrooter/chrooter.sh $@
+#     export CHROOTER_PREFIX="/mnt"
+#     $BASE_DIR/chrooter/chrooter.sh $@
+# }
+
+# gen_name_template() {
+#     local NAME="$1"
+#     local TAG="$2"
+#     local PLATFORM="$3"
+#     local ARCH="$4"
+#     local SUFFIX="$4"
+#
+#     if [ ! -z "$TAG" ]; then
+#         TAG="-$TAG"
+#     fi
+#
+#     echo "$NAME-%VERSION%-${ARCH}bit-$PLATFORM$TAG-%DATE%-%COMMIT%$SUFFIX"
 # }
 
 # OPENTOONZ_TESTING_TAG="test"
+# SYNFIGSTUDIO_TESTING_TAG="test"
 
diff --git a/gen-name.sh b/gen-name.sh
new file mode 100644
index 0000000..36c24ca
--- /dev/null
+++ b/gen-name.sh
@@ -0,0 +1,14 @@
+
+gen_name_template() {
+    local NAME="$1"
+    local TAG="$2"
+    local PLATFORM="$3"
+    local ARCH="$4"
+    local SUFFIX="$4"
+    
+    if [ ! -z "$TAG" ]; then
+        TAG="-$TAG"
+    fi
+    
+    echo "$NAME-%VERSION%-${ARCH}bit-$PLATFORM$TAG-%DATE%-%COMMIT%$SUFFIX"
+}
diff --git a/publish/publish.sh b/publish/publish.sh
index bcf4cad..a071ed7 100755
--- a/publish/publish.sh
+++ b/publish/publish.sh
@@ -16,7 +16,7 @@ publish() {
     local VERSION=`cat "$VERSION_FILE" | cut -d'-' -f 1`
     local COMMIT=`cat "$VERSION_FILE" | cut -d'-' -f 2-`
     COMMIT="${COMMIT:0:5}"
-    local DATE=`date -u +%Y.%m.%d`
+    local DATE=`date -u +%y.%m.%d`
     if [ -z "$COMMIT" ]; then
         echo "Cannot find version, pheraps package not ready. Cancel."
         return 1