Use enviroments

scripts/env/use

@@ -0,0 +1,23 @@
+gvm_use() {
+	if [[ -n $1 ]]; then
+		fuzzy_match=`ls $GVM_ROOT/gos | grep "$1"`
+		if [[ $? != 0 ]]; then
+		  echo "Invalid version $1"
+		  exit 1
+		fi
+		if [ -d $GVM_ROOT/gos/$fuzzy_match ]; then
+			
+		  ln -s $GVM_ROOT/gos/$fuzzy_match
+		  ln -s $GVM_ROOT/pkgsets/$fuzzy_match/default
+
+		else
+		  echo "Invalid version $1"
+		  return 1
+		fi
+	else
+		echo "ERROR: Please specifiy the version"
+		return 1
+	fi
+	echo "Now using version $fuzzy_match"
+}
+

scripts/gvm-default

@@ -3,8 +3,9 @@ unset GOARCH
 unset GOOS
 unset GOPATH
 unset GOBIN
+
 export GVM_VERSION=`cat $GVM_ROOT/VERSION`
-export GOROOT=$GVM_ROOT/go
-export GOPATH=$GVM_ROOT/pkgs
-export PATH=$GVM_ROOT/bin:$GVM_ROOT/pkgs/bin:$GVM_ROOT/go/bin:$PATH
+
+. $GVM_ROOT/environments/default
+. $GVM_ROOT/scripts/env/*
 

scripts/list

@@ -3,12 +3,7 @@ echo "
 gvm gos
 "
 if [ -d $GVM_ROOT/gos ]; then
-	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'
-	fi
+	ls -1 $GVM_ROOT/gos | sed 's/^/   /g' | sed 's/^   '$gvm_go_name'/=> '$gvm_go_name'/g'
 fi
 echo
 

scripts/use

@@ -1,22 +0,0 @@
-#!/bin/bash
-if [[ -n $1 ]]; then
-  fuzzy_match=`ls $GVM_ROOT/gos | grep "$1"`
-  if [[ $? != 0 ]]; then
-    echo "Invalid version $1"
-    exit 1
-  fi
-  if [ -d $GVM_ROOT/gos/$fuzzy_match ]; then
-    rm -f $GVM_ROOT/go
-    ln -s $GVM_ROOT/gos/$fuzzy_match $GVM_ROOT/go
-    rm -f $GVM_ROOT/pkgs
-    ln -s $GVM_ROOT/pkgsets/$fuzzy_match/default $GVM_ROOT/pkgs
-  else
-    echo "Invalid version $1"
-    exit 1
-  fi
-else
-  echo "ERROR: Please specifiy the version"
-  exit 1
-fi
-echo "Now using version $fuzzy_match"
-