Moved default go outside gos folder

This commit is contained in:
Joshua Bussdieker
2012-01-24 00:00:08 -08:00
parent fee63bcc31
commit 1891587dc3
4 changed files with 8 additions and 6 deletions
+2
View File
@@ -1,4 +1,6 @@
*~
go
gos/
pkgs/
*.log
scripts/gvm
+2 -2
View File
@@ -4,8 +4,8 @@ if [[ $1 == "list" ]]; then
gvm gos
"
if [ -d $GVM_ROOT/gos ]; then
if [ -e $GVM_ROOT/gos/default ]; then
CUR_VER=`readlink $GVM_ROOT/gos/default | awk '{ n=split($1,path,"/"); print path[n] }'`
if [ -e $GVM_ROOT/go ]; then
CUR_VER=`readlink $GVM_ROOT/go | awk '{ n=split($1,path,"/"); print path[n] }'`
ls -1 $GVM_ROOT/gos | sed 's/^/ /g' | sed 's/^ '$CUR_VER'/=> '$CUR_VER'/g'
else
ls -1 $GVM_ROOT/gos | sed 's/^/ /g'
+2 -2
View File
@@ -2,8 +2,8 @@
if [[ $1 == "use" ]]; then
if [[ -n $2 ]]; then
if [ -d $GVM_ROOT/gos/$2 ]; then
rm -f $GVM_ROOT/gos/default
ln -s $GVM_ROOT/gos/$2 $GVM_ROOT/gos/default
rm -f $GVM_ROOT/go
ln -s $GVM_ROOT/gos/$2 $GVM_ROOT/go
rm -f $GVM_ROOT/pkgs/default
ln -s $GVM_ROOT/pkgs/$2 $GVM_ROOT/pkgs/default
echo "Now using version $2"
+2 -2
View File
@@ -3,6 +3,6 @@ unset GOARCH
unset GOOS
unset GOPATH
export GVM_VERSION=`cat $GVM_ROOT/VERSION`
export GOROOT=$GVM_ROOT/gos/default
export PATH=$GVM_ROOT/bin:$GVM_ROOT/gos/default/bin:$PATH
export GOROOT=$GVM_ROOT/go
export PATH=$GVM_ROOT/bin:$GVM_ROOT/go/bin:$PATH