Bob Mottram пре 9 година
родитељ
комит
c1c99f42f9

+ 2
- 2
src/freedombone Прегледај датотеку

6561
 	sed -i 's|#After=mysqld.service|After=mysqld.service|g' /etc/systemd/system/gogs.service
6561
 	sed -i 's|#After=mysqld.service|After=mysqld.service|g' /etc/systemd/system/gogs.service
6562
 	sed -i "s|WorkingDirectory=.*|WorkingDirectory=$GOPATH/src/github.com/gogits/gogs|g" /etc/systemd/system/gogs.service
6562
 	sed -i "s|WorkingDirectory=.*|WorkingDirectory=$GOPATH/src/github.com/gogits/gogs|g" /etc/systemd/system/gogs.service
6563
 	sed -i "s|ExecStart=.*|ExecStart=$GOPATH/src/github.com/gogits/gogs/gogs web|g" /etc/systemd/system/gogs.service
6563
 	sed -i "s|ExecStart=.*|ExecStart=$GOPATH/src/github.com/gogits/gogs/gogs web|g" /etc/systemd/system/gogs.service
6564
-	sed -i "s|Environment.*|Environment=\"USER=git\" \"HOME=/home/git\" \"GOPATH=$GOPATH\" \"GVM_ROOT=/home/git/.gvm\"|g" /etc/systemd/system/gogs.service
6564
+	sed -i "s|Environment.*|Environment=\"USER=git\" \"HOME=/home/git\" \"GOPATH=$GOPATH\" \"GVM_ROOT=$GVM_HOME\"|g" /etc/systemd/system/gogs.service
6565
 	systemctl enable gogs
6565
 	systemctl enable gogs
6566
 	systemctl daemon-reload
6566
 	systemctl daemon-reload
6567
 	systemctl restart gogs
6567
 	systemctl restart gogs
10274
 	echo "WorkingDirectory=/home/$MY_USERNAME" >> /etc/systemd/system/ipfs.service
10274
 	echo "WorkingDirectory=/home/$MY_USERNAME" >> /etc/systemd/system/ipfs.service
10275
 	echo "ExecStart=$IPFS_PATH/ipfs daemon --mount" >> /etc/systemd/system/ipfs.service
10275
 	echo "ExecStart=$IPFS_PATH/ipfs daemon --mount" >> /etc/systemd/system/ipfs.service
10276
 	echo 'Restart=on-failure' >> /etc/systemd/system/ipfs.service
10276
 	echo 'Restart=on-failure' >> /etc/systemd/system/ipfs.service
10277
-	echo "Environment=\"USER=$MY_USERNAME\" \"HOME=/home/$MY_USERNAME\" \"GOPATH=$GOPATH\" \"GVM_ROOT=/home/git/.gvm\"" >> /etc/systemd/system/ipfs.service
10277
+	echo "Environment=\"USER=$MY_USERNAME\" \"HOME=/home/$MY_USERNAME\" \"GOPATH=$GOPATH\" \"GVM_ROOT=$GVM_HOME\"" >> /etc/systemd/system/ipfs.service
10278
 	echo '' >> /etc/systemd/system/ipfs.service
10278
 	echo '' >> /etc/systemd/system/ipfs.service
10279
 	echo '[Install]' >> /etc/systemd/system/ipfs.service
10279
 	echo '[Install]' >> /etc/systemd/system/ipfs.service
10280
 	echo 'WantedBy=multi-user.target' >> /etc/systemd/system/ipfs.service
10280
 	echo 'WantedBy=multi-user.target' >> /etc/systemd/system/ipfs.service

+ 4
- 2
src/freedombone-backup-local Прегледај датотеку

50
 # get the version of Go being used
50
 # get the version of Go being used
51
 if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
51
 if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
52
 	GO_VERSION=$(cat /usr/local/bin/${PROJECT_NAME} | grep 'GO_VERSION=' | head -n 1 | awk -F '=' '{print $2}')
52
 	GO_VERSION=$(cat /usr/local/bin/${PROJECT_NAME} | grep 'GO_VERSION=' | head -n 1 | awk -F '=' '{print $2}')
53
+	GVM_HOME=$(cat /usr/local/bin/${PROJECT_NAME} | grep 'GVM_HOME=' | head -n 1 | awk -F '=' '{print $2}')
53
 else
54
 else
54
 	GO_VERSION=$(cat /usr/bin/${PROJECT_NAME} | grep 'GO_VERSION=' | head -n 1 | awk -F '=' '{print $2}')
55
 	GO_VERSION=$(cat /usr/bin/${PROJECT_NAME} | grep 'GO_VERSION=' | head -n 1 | awk -F '=' '{print $2}')
56
+	GVM_HOME=$(cat /usr/bin/${PROJECT_NAME} | grep 'GVM_HOME=' | head -n 1 | awk -F '=' '{print $2}')
55
 fi
57
 fi
56
 
58
 
57
 ADMIN_USERNAME=
59
 ADMIN_USERNAME=
383
 }
385
 }
384
 
386
 
385
 function backup_directories {
387
 function backup_directories {
386
-	export GVM_ROOT=$HOME/.gvm
388
+	export GVM_ROOT=$GVM_HOME
387
 	if [ -d $GVM_ROOT/bin ]; then
389
 	if [ -d $GVM_ROOT/bin ]; then
388
 		cd $GVM_ROOT/bin
390
 		cd $GVM_ROOT/bin
389
 		[[ -s "$GVM_ROOT/scripts/gvm" ]] && source "$GVM_ROOT/scripts/gvm"
391
 		[[ -s "$GVM_ROOT/scripts/gvm" ]] && source "$GVM_ROOT/scripts/gvm"
472
 }
474
 }
473
 
475
 
474
 function prepare_directories {
476
 function prepare_directories {
475
-	export GVM_ROOT=$HOME/.gvm
477
+	export GVM_ROOT=$GVM_HOME
476
 	if [ -d $GVM_ROOT/bin ]; then
478
 	if [ -d $GVM_ROOT/bin ]; then
477
 		cd $GVM_ROOT/bin
479
 		cd $GVM_ROOT/bin
478
 		[[ -s "$GVM_ROOT/scripts/gvm" ]] && source "$GVM_ROOT/scripts/gvm"
480
 		[[ -s "$GVM_ROOT/scripts/gvm" ]] && source "$GVM_ROOT/scripts/gvm"

+ 1
- 1
src/freedombone-backup-remote Прегледај датотеку

380
 }
380
 }
381
 
381
 
382
 function backup_gogs {
382
 function backup_gogs {
383
-	export GVM_ROOT=$HOME/.gvm
383
+	export GVM_ROOT=/home/git/gvm
384
 	if [ -d $GVM_ROOT/bin ]; then
384
 	if [ -d $GVM_ROOT/bin ]; then
385
 		cd $GVM_ROOT/bin
385
 		cd $GVM_ROOT/bin
386
 		[[ -s "$GVM_ROOT/scripts/gvm" ]] && source "$GVM_ROOT/scripts/gvm"
386
 		[[ -s "$GVM_ROOT/scripts/gvm" ]] && source "$GVM_ROOT/scripts/gvm"

+ 4
- 2
src/freedombone-restore-local Прегледај датотеку

52
 # get the version of Go being used
52
 # get the version of Go being used
53
 if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
53
 if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
54
 	GO_VERSION=$(cat /usr/local/bin/${PROJECT_NAME} | grep 'GO_VERSION=' | head -n 1 | awk -F '=' '{print $2}')
54
 	GO_VERSION=$(cat /usr/local/bin/${PROJECT_NAME} | grep 'GO_VERSION=' | head -n 1 | awk -F '=' '{print $2}')
55
+	GVM_HOME=$(cat /usr/local/bin/${PROJECT_NAME} | grep 'GVM_HOME=' | head -n 1 | awk -F '=' '{print $2}')
55
 else
56
 else
56
 	GO_VERSION=$(cat /usr/bin/${PROJECT_NAME} | grep 'GO_VERSION=' | head -n 1 | awk -F '=' '{print $2}')
57
 	GO_VERSION=$(cat /usr/bin/${PROJECT_NAME} | grep 'GO_VERSION=' | head -n 1 | awk -F '=' '{print $2}')
58
+	GVM_HOME=$(cat /usr/bin/${PROJECT_NAME} | grep 'GVM_HOME=' | head -n 1 | awk -F '=' '{print $2}')
57
 fi
59
 fi
58
 
60
 
59
 ADMIN_USERNAME=
61
 ADMIN_USERNAME=
978
 }
980
 }
979
 
981
 
980
 function restore_gogs {
982
 function restore_gogs {
981
-	export GVM_ROOT=$HOME/.gvm
983
+	export GVM_ROOT=$GVM_HOME
982
 	if [ -d $GVM_ROOT/bin ]; then
984
 	if [ -d $GVM_ROOT/bin ]; then
983
 		cd $GVM_ROOT/bin
985
 		cd $GVM_ROOT/bin
984
 		[[ -s "$GVM_ROOT/scripts/gvm" ]] && source "$GVM_ROOT/scripts/gvm"
986
 		[[ -s "$GVM_ROOT/scripts/gvm" ]] && source "$GVM_ROOT/scripts/gvm"
991
 			return
993
 			return
992
 		fi
994
 		fi
993
 	fi
995
 	fi
994
-	if [ $GIT_DOMAIN_NAME ]; then
996
+	if [ ${#GIT_DOMAIN_NAME} -gt 2 ]; then
995
 		restore_database gogs ${GIT_DOMAIN_NAME}
997
 		restore_database gogs ${GIT_DOMAIN_NAME}
996
 		if [ -d $USB_MOUNT/backup/gogs ]; then
998
 		if [ -d $USB_MOUNT/backup/gogs ]; then
997
 			echo $"Restoring Gogs settings"
999
 			echo $"Restoring Gogs settings"

+ 1
- 1
src/freedombone-restore-remote Прегледај датотеку

846
 }
846
 }
847
 
847
 
848
 function restore_gogs {
848
 function restore_gogs {
849
-	export GVM_ROOT=$HOME/.gvm
849
+	export GVM_ROOT=$GVM_HOME
850
 	if [ -d $GVM_ROOT/bin ]; then
850
 	if [ -d $GVM_ROOT/bin ]; then
851
 		cd $GVM_ROOT/bin
851
 		cd $GVM_ROOT/bin
852
 		[[ -s "$GVM_ROOT/scripts/gvm" ]] && source "$GVM_ROOT/scripts/gvm"
852
 		[[ -s "$GVM_ROOT/scripts/gvm" ]] && source "$GVM_ROOT/scripts/gvm"