From 167423b70d7aa0a1351bfcd7f6cfcc7d6e7f37cb Mon Sep 17 00:00:00 2001
From: Massimiliano Adamo <massimiliano.adamo@geant.org>
Date: Sun, 11 Apr 2021 16:07:20 +0200
Subject: [PATCH] rename scripts

---
 build.sh => build-binary-for-linux-64.sh      | 12 ++---
 ...ows-amd64.sh => build-binary-for-win-64.sh | 48 ++++++++++---------
 2 files changed, 31 insertions(+), 29 deletions(-)
 rename build.sh => build-binary-for-linux-64.sh (80%)
 rename build-windows-amd64.sh => build-binary-for-win-64.sh (58%)

diff --git a/build.sh b/build-binary-for-linux-64.sh
similarity index 80%
rename from build.sh
rename to build-binary-for-linux-64.sh
index aaa3820..1e3c6b6 100755
--- a/build.sh
+++ b/build-binary-for-linux-64.sh
@@ -11,11 +11,11 @@ export BIN_NAME PATH GOPATH PROG_VERSION BUILDTIME
 
 REPO_DIR=$(dirname $0)
 if [ "$REPO_DIR" = '.' ]; then
-    REPO_DIR=`pwd`
+    REPO_DIR=$(pwd)
 fi
 ln -sf "$REPO_DIR" "${GOPATH}/src/"
 REPO_NAME=$(basename "$REPO_DIR")
-cd $REPO_NAME
+cd "${GOPATH}/src/$REPO_NAME"
 
 #LATEST_TAG=$(git describe --tags $(git rev-list --tags --max-count=1))
 #PROG_VERSION=$(echo $LATEST_TAG | sed -e 's/^v//')
@@ -29,9 +29,6 @@ run_upx() {
     upx --brute ${GOPATH}/bin/${BIN_NAME}
 }
 
-
-rm -rf ${GOPATH}/src/github.com/maxadamo/${BIN_NAME} ${GOPATH}/src/gitlab.geant.net/devops/${BIN_NAME}
-#go get -ldflags "-s -w -X main.appVersion=${PROG_VERSION} -X main.buildTime=${BUILDTIME}" gitlab.geant.net/devops/${BIN_NAME}
 go get -ldflags "-s -w -X main.appVersion=${PROG_VERSION} -X main.buildTime=${BUILDTIME}" .
 if [ $? -gt 0 ]; then
     echo -e "\nthere was an error while compiling the code\n"
@@ -40,6 +37,7 @@ fi
 echo ""
 
 while true; do
+    echo -e "\nUPX degrades performances but in the case of acme-downloader it is not noticeable\n"
     read -p "Do you wish to run upx against ${BIN_NAME}? (y/n) " yn
     case $yn in
     [Yy]*)
@@ -48,7 +46,9 @@ while true; do
         break
         ;;
     [Nn]*) break ;;
-    *) echo "Please answer yes or no." ;;
+    *)
+        echo "Please answer Y|y or N|n."
+        ;;
     esac
 done
 
diff --git a/build-windows-amd64.sh b/build-binary-for-win-64.sh
similarity index 58%
rename from build-windows-amd64.sh
rename to build-binary-for-win-64.sh
index bdcadf0..b83deae 100755
--- a/build-windows-amd64.sh
+++ b/build-binary-for-win-64.sh
@@ -17,35 +17,37 @@ ln -sf "$REPO_DIR" "${GOPATH}/src/"
 REPO_NAME=$(basename "$REPO_DIR")
 cd "${GOPATH}/src/$REPO_NAME"
 
+run_upx() {
+    if ! which upx &>/dev/null; then
+        echo "please download upx here https://github.com/upx/upx/releases"
+        echo "and store the executable within your \$PATH"
+        exit
+    fi
+    upx --brute ${GOPATH}/bin/${BIN_NAME}
+}
+
+
 # env GOOS=windows GOARCH=amd64 go build -ldflags "-s -w -X main.appVersion=${PROG_VERSION} -X main.buildTime=${BUILDTIME}" .
 env GOOS=windows GOARCH=amd64 go get -ldflags "-s -w -X main.appVersion=${PROG_VERSION} -X main.buildTime=${BUILDTIME}" .
 if [ $? -gt 0 ]; then
     echo -e "\nthere was an error while compiling the code\n"
     exit
 fi
-echo ""
-
-
-#run_upx() {
-#    if ! which upx &>/dev/null; then
-#        echo "please download upx here https://github.com/upx/upx/releases"
-#        echo "and store the executable within your \$PATH"
-#        exit
-#    fi
-#    upx --brute ${GOPATH}/bin/${BIN_NAME}
-#}
 
-#while true; do
-#    read -p "Do you wish to run upx against ${BIN_NAME}? (y/n) " yn
-#    case $yn in
-#    [Yy]*)
-#        echo ""
-#        run_upx
-#        break
-#        ;;
-#    [Nn]*) break ;;
-#    *) echo "Please answer yes or no." ;;
-#    esac
-#done
+while true; do
+    echo -e "\nUPX degrades performances but in the case of acme-downloader it is not noticeable\n"
+    read -p "Do you wish to run upx against ${BIN_NAME}? (y/n) " yn
+    case $yn in
+    [Yy]*)
+        echo ""
+        run_upx
+        break
+        ;;
+    [Nn]*) break ;;
+    *)
+        echo "Please answer Y|y or N|n."
+        ;;
+    esac
+done
 
 #echo -e "\nthe binary was compiled and it is avilable as:\n - ${GOPATH}/bin/${BIN_NAME}\n"
-- 
GitLab