improve output when re-installing or switching go versions

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

diff --git a/golang/install.bash b/golang/install.bash
index e14d8b0776ef4a31d0dffdc0287a939edae12f8c..2ecf7d7b7cce042a4975a601f4093c3ae040e137 100644 (file)
--- a/golang/install.bash
+++ b/golang/install.bash
@@ -46,32 +46,37 @@ common_go_bin="${HOME}/go"
 new_go_bin="${HOME}/.local/opt/go-bin-v${WEBI_VERSION}"
 
 update_go_home() {
-    rm -rf "$common_go_home"
+    rm -rf "$common_go_home" # should be a symlink
     ln -s "$new_go_home" "$common_go_home"
     # TODO get better output from pathman / output the path to add as return to webi bootstrap
     webi_path_add "$common_go_home/bin"
 
     rm -rf "$common_go_bin"
+    mkdir -p "$new_go_bin/bin"
     ln -s "$new_go_bin" "$common_go_bin"
     webi_path_add "$common_go_bin/bin"
 }
 
-if [ -x "$new_go_home/bin/go" ]; then
-  update_go_home
-  exit 0
-fi
-
 # Test for existing version
 set +e
 cur_go="$(command -v go)"
 set -e
+cur_go_version=""
 if [ -n "$cur_go" ]; then
-  cur_ver=$(go version | cut -d' ' -f3 | sed 's:go::')
-  if [ "$cur_ver" == "$(echo $WEBI_VERSION | sed 's:\.0::g')" ]; then
-    echo "go v$WEBI_VERSION already installed at $cur_go"
+  cur_go_version=$(go version | cut -d' ' -f3 | sed 's:go::')
+
+  if [ "$cur_go_version" == "$WEBI_VERSION" ]; then
+    echo "go$WEBI_VERSION already installed at $cur_go"
     exit 0
-  elif [ "$cur_go" != "$new_go" ]; then
-    echo "WARN: possible conflict with go v$WEBI_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