Bump version

Use HTTPS instead of SSH when downloading the git repo

VERSION

@@ -1 +1 @@
-1.0.10
+1.0.12

bin/gvm

@@ -32,20 +32,12 @@ else
 	elif [[ -n $command ]]; then
 		display_error "Unrecognized command line argument: '$command'"
 	else
-		echo "= gvm
+		echo "Usage: gvm [command]
 
-* http://github.com/moovweb/gvm
-
-== DESCRIPTION:
-
-GVM is the Go Version Manager
-
-== Usage
-
-  gvm Command
-
-== Command
+Description:
+  GVM is the Go Version Manager
 
+Commands:
   version    - print the gvm version number
   get        - gets the latest code (for debugging)
   use        - select a go version to use
@@ -55,6 +47,7 @@ GVM is the Go Version Manager
   uninstall  - uninstall go versions
   list       - list installed go versions
   listall    - list available versions
-  pkgset     - manage go packages sets"
+  pkgset     - manage go packages sets
+"
 	fi
 fi

binscripts/gvm-installer

@@ -16,6 +16,26 @@ update_profile() {
 	fi
 }
 
+check_existing_go() {
+	if [ "$GOROOT" == "" ]; then
+		echo "No existing Go versions detected"
+		return
+	fi
+	echo "Created profile for existing install of Go at $GOROOT"
+	mkdir -p $GVM_DEST/$GVM_NAME/environments &> /dev/null || display_error "Failed to create environment directory"
+	mkdir -p $GVM_DEST/$GVM_NAME/pkgsets/system/global &> /dev/null || display_error "Failed to create new package set"
+	mkdir -p $GVM_DEST/$GVM_NAME/gos/system &> /dev/null || display_error "Failed to create new Go folder"
+	cat << EOF > $GVM_DEST/$GVM_NAME/environments/system
+# Automatically generated file. DO NOT EDIT!
+export GVM_ROOT; GVM_ROOT="$GVM_DEST/$GVM_NAME"
+export gvm_go_name; gvm_go_name="system"
+export gvm_pkgset_name; gvm_pkgset_name="global"
+export GOROOT; GOROOT="$GOROOT"
+export GOPATH; GOPATH="$GVM_DEST/$GVM_NAME/pkgsets/system/global"
+export PATH; PATH="$GVM_DEST/$GVM_NAME/pkgsets/system/global:$GOROOT/bin:$GVM_ROOT/bin:\$PATH"
+EOF
+}
+
 BRANCH=$1
 GVM_DEST=$2
 if [ "$GVM_DEST" == "" ]; then
@@ -25,7 +45,7 @@ else
 	GVM_NAME="gvm"
 fi
 
-SRC_REPO=git://github.com/moovweb/gvm.git
+SRC_REPO=https://github.com/moovweb/gvm.git
 
 [ "$GVM_DEST" == "" ] && display_error "No destination specified!"
 [ -d $GVM_DEST/$GVM_NAME ] && display_error "Already installed!"
@@ -65,6 +85,7 @@ if [ "$?" != "0" ]; then
 fi
 echo "export GVM_ROOT=$GVM_DEST/$GVM_NAME" > $GVM_DEST/$GVM_NAME/scripts/gvm
 echo ". \$GVM_ROOT/scripts/gvm-default" >> $GVM_DEST/$GVM_NAME/scripts/gvm
+check_existing_go
 [[ -s "$GVM_DEST/$GVM_NAME/scripts/gvm" ]] && source "$GVM_DEST/$GVM_NAME/scripts/gvm"
 echo "Installed GVM v${GVM_VERSION}"
 echo

config/sources

@@ -0,0 +1 @@
+git://github.com/moovweb

scripts/env/pkgset-use

@@ -24,6 +24,7 @@ function gvm_pkgset_use() {
 	fuzzy_match=`ls $GVM_ROOT/environments | sort | grep "$gvm_go_name@" | grep "$1" | head -n 1` ||
 		display_error "Invalid package set" || return 1
 
+	export PATH=$GVM_PATH_BACKUP
 	. "$GVM_ROOT/environments/$fuzzy_match" ||
 		display_error "Failed to source the package set environment" || return 1
 

scripts/install

@@ -3,25 +3,35 @@
 
 function show_usage() {
 	echo "Usage: gvm install [version] [options]"
-	echo "    -s, --source=SOURCE       Install Go from specified source."
-	echo "    -h, --help                Display this message."
+	echo "    -s,  --source=SOURCE      Install Go from specified source."
+	echo "    -pb, --with-protobuf      Install Go protocol buffers."
+	echo "    -h,  --help               Display this message."
 }
 
 read_command_line() {
 	VERSION=$1
-	shift
+	if [ "${VERSION:0:1}" != "-" ]; then
+		shift
+	else
+		display_warning "Invalid version: $1"
+		show_usage
+		exit 1
+	fi
 	GO_SOURCE_URL=https://go.googlecode.com/hg/
 	for i in $*; do
 		case $i in
 			-s=*|--source=*)
 				GO_SOURCE_URL=$i
 			;;
-			-h|--help*)
+			-pb|--with-protobuf)
+				INSTALL_PB="true"
+			;;
+			-h|--help)
 				show_usage
 				exit 0
 			;;
 			*)
-				echo "Invalid option $i"
+				display_warning "Invalid option $i"
 				show_usage
 				exit 65 # Bad arguments
 			;;
@@ -38,7 +48,7 @@ download_source() {
 }
 
 check_tag() {
-	version=`hg tags -R $GO_CACHE_PATH | awk '{print $1}' | sort | grep $VERSION | head -n 1 | grep $VERSION`
+	version=`hg tags -R $GO_CACHE_PATH | awk '{print $1}' | sort | grep "$VERSION" | head -n 1 | grep "$VERSION"`
 }
 
 update_source() {
@@ -81,11 +91,11 @@ create_enviroment() {
 
 install_go() {
 	GO_INSTALL_ROOT=$GVM_ROOT/gos/$version
-	#trap 'rm -rf $GO_INSTALL_ROOT; display_error "Canceled!"' INT
+	trap 'rm -rf $GO_INSTALL_ROOT; display_error "Canceled!"' INT
 
 	# Check for existing install
-	if [ -d $GO_INSTALL_ROOT ]; then
-		[ -f $GO_INSTALL_ROOT/manifest ] &&
+	if [ -d "$GO_INSTALL_ROOT" ]; then
+		[ -f "$GO_INSTALL_ROOT/manifest" ] &&
 			display_error "Already installed!"
 		display_warning "Removing corrupt install..."
 		gvm uninstall $version
@@ -106,7 +116,7 @@ install_gpkg() {
 	display_message " * Installing gpkg..."
 	$GVM_GOINSTALL github.com/moovweb/gpkg > $GVM_ROOT/logs/$version-gpkg.log 2>&1
 	if [[ $? -ne 0 ]]; then
-		echo "Failed to install gpkg"
+		display_warning "Failed to install gpkg"
 		return 1
 	fi
 }
@@ -115,7 +125,7 @@ install_gb() {
 	display_message " * Installing gb..."
 	$GVM_GOINSTALL github.com/jbussdieker/go-gb/gb > $GVM_ROOT/logs/$version-gb.log 2>&1
 	if [[ $? -ne 0 ]]; then
-		echo "Failed to install gb"
+		display_warning "Failed to install gb"
 		return 1
 	fi
 }
@@ -124,14 +134,14 @@ install_goprotobuf() {
 	display_message " * Installing goprotobuf..."
 	$GVM_GOINSTALL goprotobuf.googlecode.com/hg/proto > $GVM_ROOT/logs/$version-pb-compiler.log 2>&1
 	if [[ $? -ne 0 ]]; then
-		echo "Failed to install goprotobuf"
+		display_warning "Failed to install goprotobuf"
 		return 1
 	fi
 	#if [[ $version == "release.r60.3" ]]; then
 		cd $GVM_ROOT/gos/$version/src/pkg/goprotobuf.googlecode.com/hg/compiler
 		make install >> $GVM_ROOT/logs/$version-pb-compiler.log 2>&1
 		if [[ $? -ne 0 ]]; then
-			echo "Failed to install goprotobuf compiler"
+			display_warning "Failed to install goprotobuf compiler"
 			return 1
 		fi
 	#fi
@@ -140,10 +150,11 @@ install_goprotobuf() {
 main() {
 	trap 'display_error "Canceled!"' INT
 	read_command_line $@
-	[ -z $VERSION ] && display_error "No version specified"
+	[ "$VERSION" == "" ] && display_error "No version specified"
 	download_source
 	check_tag || (update_source && check_tag) || display_error "Unrecognized Go version"
 	install_go
+
 	GVM_GOINSTALL="goinstall"
 	which goinstall &> /dev/null ||
 		GVM_GOINSTALL="go get"
@@ -151,7 +162,9 @@ main() {
 	if [[ "$?" == "1" ]]; then
 		install_gpkg
 		install_gb
-		install_goprotobuf
+		if [ "$INSTALL_PB" == "true" ]; then
+			install_goprotobuf
+		fi
 	fi
 	cd $GO_INSTALL_ROOT && find . > manifest
 }

scripts/pkgset-create

@@ -13,8 +13,8 @@ cp $GVM_ROOT/environments/$gvm_go_name $GVM_ROOT/environments/$gvm_go_name@$1 ||
 	display_error "Could copy environment"
 echo "export gvm_pkgset_name=\"$1\"" >> $GVM_ROOT/environments/$gvm_go_name@$1 ||
 	display_error "Could not extend environment"
-echo "export GOPATH; GOPATH=\"$GVM_ROOT/pkgsets/release.r60.3/$1:\$GOPATH\"" >> $GVM_ROOT/environments/$gvm_go_name@$1 ||
+echo "export GOPATH; GOPATH=\"$GVM_ROOT/pkgsets/$gvm_go_name/$1:\$GOPATH\"" >> $GVM_ROOT/environments/$gvm_go_name@$1 ||
 	display_error "Could not extend environment"
-echo "export PATH; PATH=\"$GVM_ROOT/pkgsets/release.r60.3/$1/bin:\$PATH\"" >> $GVM_ROOT/environments/$gvm_go_name@$1 ||
+echo "export PATH; PATH=\"$GVM_ROOT/pkgsets/$gvm_go_name/$1/bin:\$PATH\"" >> $GVM_ROOT/environments/$gvm_go_name@$1 ||
 	display_error "Could not extend environment"