From: AJ ONeal <coolaj86@gmail.com>
Date: Sat, 13 Jun 2020 20:32:15 +0000 (-0600)
Subject: improve output when re-installing or switching go versions
X-Git-Url: https://git.josue.xyz/?p=webi-installers%2F.git;a=commitdiff_plain;h=349c9dbd5af1a9c0208f9f898b47aa597630793a

improve output when re-installing or switching go versions
---

diff --git a/golang/install.bash b/golang/install.bash
index d1fb672..138f233 100644
--- 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)"
@@ -75,8 +69,15 @@ 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"
     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" ] && [ "$cur_go" != "$new_go" ]; then
+      echo "WARN: possible conflict between go${WEBI_VERSION} and go${cur_go_version} at ${cur_go}"
+    fi
+    if [ -x "$new_go_home/bin/go" ]; then
+      update_go_home
+      echo "switched to go${WEBI_VERSION} at $new_go_home"
+      exit 0
+    fi
   fi
 fi