cleanup: shfmt, shellcheck, and whitespace

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

diff --git a/golang/install.sh b/golang/install.sh
index 5f7af1642e5e893443d5cc3ab2a2b6af9232ff29..01b5a19b923fb3449e9fe03a55a42a0c7b68adc6 100644 (file)
--- a/golang/install.sh
+++ b/golang/install.sh
@@ -19,7 +19,7 @@ pkg_get_current_version() {
     #       go version go1.14.2 darwin/amd64
     # This trims it down to just the version number:
     #       1.14.2
-    echo "$(go version 2>/dev/null | head -n 1 | cut -d' ' -f3 | sed 's:go::')"
+    echo "$(go version 2> /dev/null | head -n 1 | cut -d' ' -f3 | sed 's:go::')"
 }
 
 pkg_format_cmd_version() {
@@ -54,22 +54,47 @@ pkg_post_install() {
 
     # Install x go
     echo "Building go language tools..."
+    export GO111MODULE=on
+
+    # See https://pkg.go.dev/mod/golang.org/x/tools?tab=packages
+
+    echo ""
+    echo godoc
+    "$pkg_dst_cmd" get golang.org/x/tools/cmd/godoc@latest > /dev/null #2>/dev/null
+
+    echo ""
     echo gopls
-    "$pkg_dst_cmd" get golang.org/x/tools/gopls > /dev/null #2>/dev/null
+    "$pkg_dst_cmd" get golang.org/x/tools/gopls@latest > /dev/null #2>/dev/null
+
+    echo ""
+    echo guru
+    "$pkg_dst_cmd" get golang.org/x/tools/cmd/guru@latest > /dev/null #2>/dev/null
+
+    echo ""
     echo golint
-    "$pkg_dst_cmd" get golang.org/x/lint/golint > /dev/null #2>/dev/null
-    echo errcheck
-    "$pkg_dst_cmd" get github.com/kisielk/errcheck > /dev/null #2>/dev/null
-    echo gotags
-    "$pkg_dst_cmd" get github.com/jstemmer/gotags > /dev/null #2>/dev/null
+    "$pkg_dst_cmd" get golang.org/x/lint/golint@latest > /dev/null #2>/dev/null
+
+    echo ""
     echo goimports
-    "$pkg_dst_cmd" get golang.org/x/tools/cmd/goimports > /dev/null #2>/dev/null
+    "$pkg_dst_cmd" get golang.org/x/tools/cmd/goimports@latest > /dev/null #2>/dev/null
+
+    echo ""
+    echo gomvpkg
+    "$pkg_dst_cmd" get golang.org/x/tools/cmd/gomvpkg@latest > /dev/null #2>/dev/null
+
+    echo ""
     echo gorename
-    "$pkg_dst_cmd" get golang.org/x/tools/cmd/gorename > /dev/null #2>/dev/null
+    "$pkg_dst_cmd" get golang.org/x/tools/cmd/gorename@latest > /dev/null #2>/dev/null
+
+    echo ""
     echo gotype
-    "$pkg_dst_cmd" get golang.org/x/tools/cmd/gotype > /dev/null #2>/dev/null
+    "$pkg_dst_cmd" get golang.org/x/tools/cmd/gotype@latest > /dev/null #2>/dev/null
+
+    echo ""
     echo stringer
-    "$pkg_dst_cmd" get golang.org/x/tools/cmd/stringer > /dev/null #2>/dev/null
+    "$pkg_dst_cmd" get golang.org/x/tools/cmd/stringer@latest > /dev/null #2>/dev/null
+
+    echo ""
 }
 
 pkg_done_message() {