add pkg_format_cmd_version

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

diff --git a/golang/install.bash b/golang/install.bash
index 422b0ebf4b1d70c0c4a8f074c5effbc6feeda7ff..af3c34e5e2f447c1be64ae7425d1fb4ddcd32ade 100644 (file)
--- a/golang/install.bash
+++ b/golang/install.bash
@@ -56,6 +56,12 @@ pkg_get_current_version() {
     echo "$(go version | cut -d' ' -f3 | sed 's:go::')"
 }
 
+pkg_format_cmd_version() {
+    # 'go v1.14.0' will be 'go1.14'
+    my_version=$(echo "$1" | sed 's:\.0::g')
+    echo "${pkg_cmd_name}${my_version}"
+}
+
 pkg_link_new_version() {
     # 'pkg_common_opt' will default to $HOME/.local/opt/go
     # 'pkg_new_opt' will be the installed version, such as to $HOME/.local/opt/go-v1.14.2
@@ -107,7 +113,7 @@ pkg_post_install() {
     # Updates PATH with
     #       "$HOME/.local/opt/go"
     webi_path_add "$pkg_common_bin"
-    webi_path_add "$GOBIN"
+    webi_path_add "$GOBIN/bin"
 
     # Install x go
     "$pkg_common_cmd" get golang.org/x/tools/cmd/goimports > /dev/null 2>/dev/null