gvm

src/freedombone

@@ -2647,7 +2647,8 @@ function select_go_version {
         echo "export GVM_ROOT=$GVM_ROOT" >> ~/.bashrc
     fi  
     cd $GVM_ROOT/bin
-    ./gvm use go${GO_VERSION} --default
+	[[ -s "$GVM_ROOT/scripts/gvm" ]] && source "$GVM_ROOT/scripts/gvm"
+    gvm use go${GO_VERSION} --default
     systemctl set-environment GOPATH=$GOPATH
 
     if [ ${#GOPATH} -lt 2 ]; then
@@ -6321,25 +6322,25 @@ function upgrade_golang {
     # TODO: this script is all over the place
     # and contains hardcoded github. See if you can do better
     ./binscripts/gvm-installer
-    [[ -s "$HOME/.gvm/scripts/gvm" ]] && source "$HOME/.gvm/scripts/gvm"
-    if [ ! -f $HOME/.gvm/bin/gvm ]; then
+    export GVM_ROOT=$HOME/.gvm
+    [[ -s "$GVM_ROOT/scripts/gvm" ]] && source "$GVM_ROOT/scripts/gvm"
+    if [ ! -f $GVM_ROOT/bin/gvm ]; then
         echo $'gvm was not installed'
     fi
-    export GVM_ROOT=$HOME/.gvm
-    if ! grep -q "GVM_ROOT=" ~/.bashrc; then
-        echo 'export GVM_ROOT=$HOME/.gvm' >> ~/.bashrc
+    if ! grep -q "export GVM_ROOT=" ~/.bashrc; then
+        echo "export GVM_ROOT=$GVM_ROOT" >> ~/.bashrc
     fi  
 
     cd $GVM_ROOT/bin
-    ./gvm install go1.4
-    ./gvm use go1.4
+    gvm install go1.4
+    gvm use go1.4
     export GOROOT_BOOTSTRAP=$GOROOT
-    ./gvm install go${GO_VERSION}
+    gvm install go${GO_VERSION}
     if [ ! "$?" = "0" ]; then
         echo $'Unable to upgrade golang'
         exit 529252
     fi
-    ./gvm use go${GO_VERSION} --default
+    gvm use go${GO_VERSION} --default
 
     if ! grep -q "gvm commit" $COMPLETION_FILE; then
         echo "gvm commit:$GVM_COMMIT" >> $COMPLETION_FILE