Rename gvm directory

This commit is contained in:
Bob Mottram 2016-05-09 16:46:02 +01:00
parent df0c0f8799
commit 6b7060ab0e
No known key found for this signature in database
GPG Key ID: BA68F26108DC9F87
1 changed files with 10 additions and 6 deletions

View File

@ -234,7 +234,7 @@ GIT_DOMAIN_REPO="https://github.com/gogits/gogs"
GIT_ADMIN_PASSWORD= GIT_ADMIN_PASSWORD=
GOGS_COMMIT='3fb4f7f4980b4339fd9ef6a3ba5b0acab83d264d' GOGS_COMMIT='3fb4f7f4980b4339fd9ef6a3ba5b0acab83d264d'
GO_PACKAGE_MANAGER_REPO="https://github.com/gpmgo/gopm" GO_PACKAGE_MANAGER_REPO="https://github.com/gpmgo/gopm"
GVM_HOME=/home/git/.gvm GVM_HOME=/home/git/gvm
GVM_REPO="https://github.com/moovweb/gvm" GVM_REPO="https://github.com/moovweb/gvm"
GVM_COMMIT='25ea8ae158e2861c92e2b22c458e60840157832f' GVM_COMMIT='25ea8ae158e2861c92e2b22c458e60840157832f'
@ -6352,6 +6352,8 @@ function upgrade_golang {
return return
fi fi
export GVM_ROOT=$GVM_HOME
apt-get -y install curl git mercurial make binutils bison gcc build-essential apt-get -y install curl git mercurial make binutils bison gcc build-essential
if [ ! -d $INSTALL_DIR ]; then if [ ! -d $INSTALL_DIR ]; then
mkdir $INSTALL_DIR mkdir $INSTALL_DIR
@ -6368,20 +6370,22 @@ function upgrade_golang {
if [ -d /root/.gvm ]; then if [ -d /root/.gvm ]; then
rm -rf /root/.gvm rm -rf /root/.gvm
fi fi
sed -i "s|export GVM_ROOT=.*|export GVM_ROOT=$GVM_ROOT|g" ~/.bashrc
# TODO: this script is all over the place
# and contains hardcoded github. See if you can do better
./binscripts/gvm-installer
if [ ! -d /home/git ]; then if [ ! -d /home/git ]; then
# add a gogs user account within which the gvm home directory will exist # add a gogs user account within which the gvm home directory will exist
adduser --disabled-login --gecos 'Gogs' git adduser --disabled-login --gecos 'Gogs' git
fi fi
export GVM_ROOT=$GVM_HOME
if [ ! -d $GVM_ROOT ]; then if [ ! -d $GVM_ROOT ]; then
mkdir -p $GVM_ROOT mkdir -p $GVM_ROOT
fi fi
# TODO: this script is all over the place
# and contains hardcoded github. See if you can do better
./binscripts/gvm-installer master /home/git
[[ -s "$GVM_ROOT/scripts/gvm" ]] && source "$GVM_ROOT/scripts/gvm" [[ -s "$GVM_ROOT/scripts/gvm" ]] && source "$GVM_ROOT/scripts/gvm"
if [ ! -f $GVM_ROOT/bin/gvm ]; then if [ ! -f $GVM_ROOT/bin/gvm ]; then
echo $'gvm was not installed' echo $'gvm was not installed'