Update VERSION

Merge pull request #26 from meatballhat/allow-in-session-path-changes
Allow for in-session changes to $PATH
2026-08-10 05:16:13 +10:00 · 2013-06-24 19:04:46 -06:00 · 2013-06-20 06:52:59 -07:00 · 2013-06-12 08:50:10 -04:00 · 2013-05-29 02:40:23 -07:00 · 2013-05-29 02:09:34 -07:00
6 changed files with 12 additions and 6 deletions
@@ -1 +1 @@
-1.0.17
+1.0.18
@@ -65,7 +65,7 @@ _gvm()
 		use|uninstall)
 			[ ! -d $GVM_ROOT/gos ] && return 1
 			[[ $COMP_CWORD > 2 ]] && return 1
-			local installed_versions=$(for x in `$LS_PATH $GVM_ROOT/gos`; do echo ${x} ; done )
+			local installed_versions="$(for x in `$LS_PATH $GVM_ROOT/gos`; do echo ${x} ; done )"
 			COMPREPLY=( $(compgen -W "${installed_versions}" -- ${cur}) )
 			return 0
 		;;
@@ -20,7 +20,7 @@ function gvm_pkgset_use() {
 		[[ "$2" != "--default" ]] ||
 			display_error "Cannot set local pkgset as default" || return 1

-		export PATH=$GVM_PATH_BACKUP
+		gvm_export_path
 		. "$LOCAL_TOP/environments/$fuzzy_match" ||
 			display_error "Failed to source the package set environment" || return 1

@@ -30,7 +30,7 @@ function gvm_pkgset_use() {
 		fuzzy_match=`$LS_PATH $GVM_ROOT/environments | $SORT_PATH | $GREP_PATH "$gvm_go_name@" | $GREP_PATH "$1" | $HEAD_PATH -n 1` ||
 			display_error "Invalid package set" || return 1

-		export PATH=$GVM_PATH_BACKUP
+		gvm_export_path
 		. "$GVM_ROOT/environments/$fuzzy_match" ||
 			display_error "Failed to source the package set environment" || return 1

@@ -14,7 +14,7 @@ function gvm_use() {
 		fi
 	fi

-	export PATH=$GVM_PATH_BACKUP
+	gvm_export_path
 	. $GVM_ROOT/environments/$fuzzy_match &> /dev/null || display_error "Couldn't source environment" || return 1
 	if [[ "$2" == "--default" ]]; then
 		cp $GVM_ROOT/environments/$fuzzy_match $GVM_ROOT/environments/default || display_error "Couldn't make $fuzzy_match default"
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+function gvm_export_path() {
+	export PATH="$GVM_ROOT/bin:`echo "$PATH" | tr ":" "\n" | grep -v '^$' | egrep -v "$GVM_ROOT/(pkgsets|gos|bin)" | tr "\n" ":" | sed 's/:*$//'`"
+	export GVM_PATH_BACKUP="$PATH"
+}
+
@@ -196,7 +196,7 @@ main() {
 	which goinstall &> /dev/null ||
 		GVM_GOINSTALL="go get"

-	x="`hg tags -R ~/.gvm/archive/go`"; echo ${x#*b0819469a6df} | $GREP_PATH "$version " &> /dev/null
+	x="`hg tags -R $GO_CACHE_PATH`"; echo ${x#*b0819469a6df} | $GREP_PATH "$version " &> /dev/null
 	if [[ "$?" == "1" ]]; then
 		if [[ "$INSTALL_BUILD_TOOLS" == "true" ]]; then
 			install_gb || display_warning "Failed to install gb"
Author	SHA1	Message	Date
jbussdieker	c8b4b1f4ed	Update VERSION	2013-06-24 19:04:46 -06:00
jbussdieker	325e9a75f3	Merge pull request #26 from meatballhat/allow-in-session-path-changes Allow for in-session changes to $PATH	2013-06-20 06:52:59 -07:00
Dan Buch	033c72a113	Seeing if this makes the experience with $PATH more like I'd expect	2013-06-12 08:50:10 -04:00
jbussdieker	45a4d1ff42	Merge pull request #25 from benizi/fix-zsh-completion Fixes quoting so completion works in zsh	2013-05-29 02:40:23 -07:00
jbussdieker	faac33ab5e	Merge pull request #24 from benizi/fix-hardcoded-path Fixes hard-coded path to cache	2013-05-29 02:09:34 -07:00
Benjamin R. Haskell	8999f3f072	Fixes quoting so completion works in zsh	2013-05-29 00:00:23 -04:00
Benjamin R. Haskell	3f72ed5f89	Fixes hard-coded path to cache	2013-05-28 23:53:37 -04:00
jbussdieker	7765f13d9a	Merge pull request #21 from matttproud/feature/native-code-support Provide support for vendored native code workflow.	2013-05-24 06:43:10 -07:00
@@ -1 +1 @@
 .0.17
 .0.18