bugfix version handling regression

[webi-installers/.git] / golang / install.bash

diff --git a/golang/install.bash b/golang/install.bash
index d1fb672ba036f6d11932a93a7cefc5a4309c22ec..ac60033db7b4a340eaeb3ed8839c56e6ad163c46 100644 (file)
--- a/golang/install.bash
+++ b/golang/install.bash
@@ -57,12 +57,6 @@ update_go_home() {
     webi_path_add "$common_go_bin/bin"
 }
 
-if [ -x "$new_go_home/bin/go" ]; then
-  update_go_home
-  echo "switched to go${WEBI_VERSION} at $new_go_home"
-  exit 0
-fi
-
 # Test for existing version
 set +e
 cur_go="$(command -v go)"
@@ -70,13 +64,19 @@ set -e
 cur_go_version=""
 if [ -n "$cur_go" ]; then
   cur_go_version=$(go version | cut -d' ' -f3 | sed 's:go::')
-fi
-if [ -n "$cur_go" ]; then
+
   if [ "$cur_go_version" == "$(echo $WEBI_VERSION | sed 's:\.0::g')" ]; then
-    echo "go v$WEBI_VERSION already installed at $cur_go"
+    echo "go$WEBI_VERSION already installed at $cur_go"
     exit 0
-  elif [ "$cur_go" != "$new_go" ]; then
-    echo "WARN: possible conflict between go${WEBI_VERSION} and go${cur_go_version} at ${cur_go}"
+  else
+    if [ "$cur_go" != "$common_go_home/bin/go" ]; then
+      echo "WARN: possible conflict between go${WEBI_VERSION} and go${cur_go_version} at ${cur_go}"
+    fi
+    if [ -x "$new_go" ]; then
+      update_go_home
+      echo "switched to go${WEBI_VERSION} at $new_go_home"
+      exit 0
+    fi
   fi
 fi