Bob Mottram преди 8 години
родител
ревизия
6b7060ab0e
No account linked to committer's email
променени са 1 файла, в които са добавени 10 реда и са изтрити 6 реда
  1. 10
    6
      src/freedombone

+ 10
- 6
src/freedombone Целия файл

234
 GIT_ADMIN_PASSWORD=
234
 GIT_ADMIN_PASSWORD=
235
 GOGS_COMMIT='3fb4f7f4980b4339fd9ef6a3ba5b0acab83d264d'
235
 GOGS_COMMIT='3fb4f7f4980b4339fd9ef6a3ba5b0acab83d264d'
236
 GO_PACKAGE_MANAGER_REPO="https://github.com/gpmgo/gopm"
236
 GO_PACKAGE_MANAGER_REPO="https://github.com/gpmgo/gopm"
237
-GVM_HOME=/home/git/.gvm
237
+GVM_HOME=/home/git/gvm
238
 GVM_REPO="https://github.com/moovweb/gvm"
238
 GVM_REPO="https://github.com/moovweb/gvm"
239
 GVM_COMMIT='25ea8ae158e2861c92e2b22c458e60840157832f'
239
 GVM_COMMIT='25ea8ae158e2861c92e2b22c458e60840157832f'
240
 
240
 
6352
 		return
6352
 		return
6353
 	fi
6353
 	fi
6354
 
6354
 
6355
+	export GVM_ROOT=$GVM_HOME
6356
+
6355
 	apt-get -y install curl git mercurial make binutils bison gcc build-essential
6357
 	apt-get -y install curl git mercurial make binutils bison gcc build-essential
6356
 	if [ ! -d $INSTALL_DIR ]; then
6358
 	if [ ! -d $INSTALL_DIR ]; then
6357
 		mkdir $INSTALL_DIR
6359
 		mkdir $INSTALL_DIR
6368
 	if [ -d /root/.gvm ]; then
6370
 	if [ -d /root/.gvm ]; then
6369
 		rm -rf /root/.gvm
6371
 		rm -rf /root/.gvm
6370
 	fi
6372
 	fi
6371
-
6372
-	# TODO: this script is all over the place
6373
-	# and contains hardcoded github. See if you can do better
6374
-	./binscripts/gvm-installer
6373
+	sed -i "s|export GVM_ROOT=.*|export GVM_ROOT=$GVM_ROOT|g" ~/.bashrc
6375
 
6374
 
6376
 	if [ ! -d /home/git ]; then
6375
 	if [ ! -d /home/git ]; then
6377
 		# add a gogs user account within which the gvm home directory will exist
6376
 		# add a gogs user account within which the gvm home directory will exist
6378
 		adduser --disabled-login --gecos 'Gogs' git
6377
 		adduser --disabled-login --gecos 'Gogs' git
6379
 	fi
6378
 	fi
6380
 
6379
 
6381
-	export GVM_ROOT=$GVM_HOME
6382
 	if [ ! -d $GVM_ROOT ]; then
6380
 	if [ ! -d $GVM_ROOT ]; then
6383
 		mkdir -p $GVM_ROOT
6381
 		mkdir -p $GVM_ROOT
6384
 	fi
6382
 	fi
6383
+
6384
+	# TODO: this script is all over the place
6385
+	# and contains hardcoded github. See if you can do better
6386
+	./binscripts/gvm-installer master /home/git
6387
+
6388
+
6385
 	[[ -s "$GVM_ROOT/scripts/gvm" ]] && source "$GVM_ROOT/scripts/gvm"
6389
 	[[ -s "$GVM_ROOT/scripts/gvm" ]] && source "$GVM_ROOT/scripts/gvm"
6386
 	if [ ! -f $GVM_ROOT/bin/gvm ]; then
6390
 	if [ ! -f $GVM_ROOT/bin/gvm ]; then
6387
 		echo $'gvm was not installed'
6391
 		echo $'gvm was not installed'