From cbe0a5e89986002f8bdddb26c015791aa41cca7e Mon Sep 17 00:00:00 2001
From: Tobias Schneck <tobias.schneck@consol.de>
Date: Thu, 8 Mar 2018 18:56:00 +0100
Subject: [PATCH] #308 adjust cleanup scripts for new name logic

---
 .build/is-feature-branch-version.sh    |  9 ---------
 .build/remove-snapshot-artifacts.sh    | 15 ++++++++-------
 docker/.build/delete_dockerhub_tags.sh |  2 +-
 3 files changed, 9 insertions(+), 17 deletions(-)
 delete mode 100644 .build/is-feature-branch-version.sh

diff --git a/.build/is-feature-branch-version.sh b/.build/is-feature-branch-version.sh
deleted file mode 100644
index d7e98d66..00000000
--- a/.build/is-feature-branch-version.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-VERSION_SURFIX=${SAKULI_VERSION:$(expr index \"$SAKULI_VERSION\" 'SNAPSHOT') +7 }
-echo "VERSION_SURFIX: $VERSION_SURFIX"
-
-if [[ $VERSION_SURFIX == "" ]]; then
-    echo "change version!"
-    exit 0
-fi
-exit 1
\ No newline at end of file
diff --git a/.build/remove-snapshot-artifacts.sh b/.build/remove-snapshot-artifacts.sh
index 25e95910..4ee29423 100755
--- a/.build/remove-snapshot-artifacts.sh
+++ b/.build/remove-snapshot-artifacts.sh
@@ -1,8 +1,9 @@
 #!/usr/bin/env bash
 echo "--------------------------------------------------------------------------------"
-echo ".... remove git tags"
+export PATTERN="SNAPSHOT"
+echo ".... remove git tags for pattern:$PATTERN"
 git fetch --tags
-tags=$(git tag | grep SNAPSHOT)
+tags=$(git tag | grep $PATTERN)
 echo $tags | xargs -n1 echo
 
 if [[ "$1" == "-y" ]]; then
@@ -19,10 +20,10 @@ else
   exit 0
 fi
 echo "--------------------------------------------------------------------------------"
-echo "... remove old SNAPSHOT zip and installer files?"
+echo "... remove old $PATTERN zip and installer files?"
 
-ssh sakuli@labs.consol.de -4 'ls /home/sakuli/htdocs/install/sakuli-v*-SNAPSHOT*.zip'
-ssh sakuli@labs.consol.de -4 'ls /home/sakuli/htdocs/install/sakuli-v*-SNAPSHOT*.jar'
+ssh sakuli@labs.consol.de -4 'ls /home/sakuli/htdocs/install/sakuli-v*-'"$PATTERN"'*.zip'
+ssh sakuli@labs.consol.de -4 'ls /home/sakuli/htdocs/install/sakuli-v*-'"$PATTERN"'*.jar'
 
 if [[ "$1" == "-y" ]]; then
     CONT="y"
@@ -32,7 +33,7 @@ else
 fi
 
 if [ "$CONT" = "y" ]; then
-    ssh sakuli@labs.consol.de -4 'rm /home/sakuli/htdocs/install/sakuli-v*-SNAPSHOT*.zip' || echo "do not fail if nothing have changed"
-    ssh sakuli@labs.consol.de -4 'rm /home/sakuli/htdocs/install/sakuli-v*-SNAPSHOT*.jar' || echo "do not fail if nothing have changed"
+    ssh sakuli@labs.consol.de -4 'rm /home/sakuli/htdocs/install/sakuli-v*-'"$PATTERN"'*.zip' || echo "do not fail if nothing have changed"
+    ssh sakuli@labs.consol.de -4 'rm /home/sakuli/htdocs/install/sakuli-v*-'"$PATTERN"'*.jar' || echo "do not fail if nothing have changed"
 fi
 
diff --git a/docker/.build/delete_dockerhub_tags.sh b/docker/.build/delete_dockerhub_tags.sh
index 97d82ec8..fbe56d66 100755
--- a/docker/.build/delete_dockerhub_tags.sh
+++ b/docker/.build/delete_dockerhub_tags.sh
@@ -15,7 +15,7 @@ IMAGES=(
     "consol/omd-labs-centos-sakuli"
     "consol/omd-labs-debian-sakuli"
 )
-PATTERN="-SNAPSHOT"
+PATTERN="SNAPSHOT"
 #PATTERN="v1.1.0-SNAPSHOT"
 
 logfile="docker.delete.images.log"