From 1891587dc37ffca2e2c5d52f6a8ed85f73e2682d Mon Sep 17 00:00:00 2001
From: Joshua Bussdieker <josh.bussdieker@moovweb.com>
Date: Tue, 24 Jan 2012 00:00:08 -0800
Subject: [PATCH] Moved default go outside gos folder

---
 .gitignore          | 2 ++
 bin/gvm-list        | 4 ++--
 bin/gvm-use         | 4 ++--
 scripts/gvm-default | 4 ++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0d4c157..f8a2bba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
 *~
+go
 gos/
 pkgs/
 *.log
+scripts/gvm
diff --git a/bin/gvm-list b/bin/gvm-list
index a50f8b9..d9b00cb 100755
--- a/bin/gvm-list
+++ b/bin/gvm-list
@@ -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'
diff --git a/bin/gvm-use b/bin/gvm-use
index f2fc8e4..6896e8c 100755
--- a/bin/gvm-use
+++ b/bin/gvm-use
@@ -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"
diff --git a/scripts/gvm-default b/scripts/gvm-default
index 39a1c87..7bfe353 100644
--- a/scripts/gvm-default
+++ b/scripts/gvm-default
@@ -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