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

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

diff --git a/golang/install.bash b/golang/install.bash
index d313044..d1fb672 100644
--- a/golang/install.bash
+++ b/golang/install.bash
@@ -59,6 +59,7 @@ update_go_home() {
 
 if [ -x "$new_go_home/bin/go" ]; then
   update_go_home
+  echo "switched to go${WEBI_VERSION} at $new_go_home"
   exit 0
 fi
 
@@ -66,13 +67,16 @@ fi
 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
+  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"
     exit 0
   elif [ "$cur_go" != "$new_go" ]; then
-    echo "WARN: possible conflict with go v$WEBI_VERSION at $cur_go"
+    echo "WARN: possible conflict between go${WEBI_VERSION} and go${cur_go_version} at ${cur_go}"
   fi
 fi