Support new default go (go1.11) & new file-listing layout for Homebrew

fbartho · Apr 16, 2019 · edb8a96 · edb8a96
1 parent df52ab7
commit edb8a96
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/bin/go_use_aliases b/bin/go_use_aliases
@@ -8,6 +8,7 @@ alias go_use_refresh="source `which go_use_fixup_env`"
 alias go_use_12="go_use go12; go_use_refresh"
 alias go_use_14="go_use go14; go_use_refresh"
 alias go_use_15="go_use go15; go_use_refresh"
+alias go_use_16="go_use go16; go_use_refresh"
 
-# brew's recipe for go 1.6 is currently "go"
-alias go_use_16="go_use go; go_use_refresh"
+# brew's recipe for go 1.11.1 is currently "go"
+alias go_use_1_11="go_use go; go_use_refresh"
diff --git a/bin/go_use_fixup_env b/bin/go_use_fixup_env
@@ -9,8 +9,7 @@
 GOPATHBASE=~/Code/gopath
 
 GOVER=$(cat ~/.go_ver)
-
-GOVERSION=$(brew list ${GOVER} | head -n 1 | cut -d '/' -f 6)
+GOVERSION=$(brew list ${GOVER} | grep '/bin/go' | head -n 1 | cut -d '/' -f 6)
 export GOROOT=$(brew --prefix)/Cellar/$GOVER/$GOVERSION/libexec
 export GOPATH="$GOPATHBASE/$GOVER"