Bob Mottram 8 years ago
parent
commit
9780201e97
No account linked to committer's email

+ 18
- 9
src/freedombone View File

2638
 }
2638
 }
2639
 
2639
 
2640
 function select_go_version {
2640
 function select_go_version {
2641
-    if [ ! -d $HOME/.gvm/scripts ]; then
2641
+    if [ ! -d $HOME/.gvm/bin ]; then
2642
         echo $'GVM was not installed'
2642
         echo $'GVM was not installed'
2643
         exit 629532
2643
         exit 629532
2644
     fi
2644
     fi
2645
-    cd $HOME/.gvm/scripts
2646
-    gvm use go${GO_VERSION} --default
2645
+    export GVM_ROOT=$HOME/.gvm
2646
+    if ! grep -q "GVM_ROOT=" ~/.bashrc; then
2647
+        echo "export GVM_ROOT=$GVM_ROOT" >> ~/.bashrc
2648
+    fi  
2649
+    cd $GVM_ROOT/bin
2650
+    ./gvm use go${GO_VERSION} --default
2647
     systemctl set-environment GOPATH=$GOPATH
2651
     systemctl set-environment GOPATH=$GOPATH
2648
 
2652
 
2649
     if [ ${#GOPATH} -lt 2 ]; then
2653
     if [ ${#GOPATH} -lt 2 ]; then
6318
     # and contains hardcoded github. See if you can do better
6322
     # and contains hardcoded github. See if you can do better
6319
     ./binscripts/gvm-installer
6323
     ./binscripts/gvm-installer
6320
     [[ -s "$HOME/.gvm/scripts/gvm" ]] && source "$HOME/.gvm/scripts/gvm"
6324
     [[ -s "$HOME/.gvm/scripts/gvm" ]] && source "$HOME/.gvm/scripts/gvm"
6321
-    if [ ! -f $HOME/.gvm/scripts/gvm ]; then
6325
+    if [ ! -f $HOME/.gvm/bin/gvm ]; then
6322
         echo $'gvm was not installed'
6326
         echo $'gvm was not installed'
6323
     fi
6327
     fi
6324
-    cd $HOME/.gvm/scripts
6325
-    gvm install go1.4
6326
-    gvm use go1.4
6328
+    export GVM_ROOT=$HOME/.gvm
6329
+    if ! grep -q "GVM_ROOT=" ~/.bashrc; then
6330
+        echo 'export GVM_ROOT=$HOME/.gvm' >> ~/.bashrc
6331
+    fi  
6332
+
6333
+    cd $GVM_ROOT/bin
6334
+    ./gvm install go1.4
6335
+    ./gvm use go1.4
6327
     export GOROOT_BOOTSTRAP=$GOROOT
6336
     export GOROOT_BOOTSTRAP=$GOROOT
6328
-    gvm install go${GO_VERSION}
6337
+    ./gvm install go${GO_VERSION}
6329
     if [ ! "$?" = "0" ]; then
6338
     if [ ! "$?" = "0" ]; then
6330
         echo $'Unable to upgrade golang'
6339
         echo $'Unable to upgrade golang'
6331
         exit 529252
6340
         exit 529252
6332
     fi
6341
     fi
6333
-    gvm use go${GO_VERSION} --default
6342
+    ./gvm use go${GO_VERSION} --default
6334
 
6343
 
6335
     if ! grep -q "gvm commit" $COMPLETION_FILE; then
6344
     if ! grep -q "gvm commit" $COMPLETION_FILE; then
6336
         echo "gvm commit:$GVM_COMMIT" >> $COMPLETION_FILE
6345
         echo "gvm commit:$GVM_COMMIT" >> $COMPLETION_FILE

+ 8
- 6
src/freedombone-backup-local View File

377
 }
377
 }
378
 
378
 
379
 function backup_directories {
379
 function backup_directories {
380
-	if [ -d $HOME/.gvm/scripts ]; then
381
-		cd $HOME/.gvm/scripts
382
-		gvm use go${GO_VERSION} --default
380
+	export GVM_ROOT=$HOME/.gvm
381
+	if [ -d $GVM_ROOT/bin ]; then
382
+		cd $GVM_ROOT/bin
383
+		./gvm use go${GO_VERSION} --default
383
 		systemctl set-environment GOPATH=$GOPATH
384
 		systemctl set-environment GOPATH=$GOPATH
384
 	fi
385
 	fi
385
 
386
 
464
 }
465
 }
465
 
466
 
466
 function prepare_directories {
467
 function prepare_directories {
467
-	if [ -d $HOME/.gvm/scripts ]; then
468
-		cd $HOME/.gvm/scripts
469
-		gvm use go${GO_VERSION} --default
468
+	export GVM_ROOT=$HOME/.gvm
469
+	if [ -d $GVM_ROOT/bin ]; then
470
+		cd $GVM_ROOT/bin
471
+		./gvm use go${GO_VERSION} --default
470
 		systemctl set-environment GOPATH=$GOPATH
472
 		systemctl set-environment GOPATH=$GOPATH
471
 	fi
473
 	fi
472
 
474
 

+ 4
- 3
src/freedombone-backup-remote View File

374
 }
374
 }
375
 
375
 
376
 function backup_gogs {
376
 function backup_gogs {
377
-	if [ -d $HOME/.gvm/scripts ]; then
378
-		cd $HOME/.gvm/scripts
379
-		gvm use go${GO_VERSION} --default
377
+	export GVM_ROOT=$HOME/.gvm
378
+	if [ -d $GVM_ROOT/bin ]; then
379
+		cd $GVM_ROOT/bin
380
+		./gvm use go${GO_VERSION} --default
380
 		systemctl set-environment GOPATH=$GOPATH
381
 		systemctl set-environment GOPATH=$GOPATH
381
 	fi
382
 	fi
382
 
383
 

+ 4
- 3
src/freedombone-restore-local View File

929
 }
929
 }
930
 
930
 
931
 function restore_gogs {
931
 function restore_gogs {
932
-	if [ -d $HOME/.gvm/scripts ]; then
933
-		cd $HOME/.gvm/scripts
934
-		gvm use go${GO_VERSION} --default
932
+	export GVM_ROOT=$HOME/.gvm
933
+	if [ -d $GVM_ROOT/bin ]; then
934
+		cd $GVM_ROOT/bin
935
+		./gvm use go${GO_VERSION} --default
935
 		systemctl set-environment GOPATH=$GOPATH
936
 		systemctl set-environment GOPATH=$GOPATH
936
 	fi
937
 	fi
937
 
938
 

+ 4
- 3
src/freedombone-restore-remote View File

798
 }
798
 }
799
 
799
 
800
 function restore_gogs {
800
 function restore_gogs {
801
-	if [ -d $HOME/.gvm/scripts ]; then
802
-		cd $HOME/.gvm/scripts
803
-		gvm use go${GO_VERSION} --default
801
+	export GVM_ROOT=$HOME/.gvm
802
+	if [ -d $GVM_ROOT/bin ]; then
803
+		cd $GVM_ROOT/bin
804
+		./gvm use go${GO_VERSION} --default
804
 		systemctl set-environment GOPATH=$GOPATH
805
 		systemctl set-environment GOPATH=$GOPATH
805
 	fi
806
 	fi
806
 
807