Merge pull request #70 from alouche/master

Display curl error message, add debug option + agnostic git gvm-installer

README

@@ -23,7 +23,7 @@ Installing
 
 To install:
 
-    bash < <(curl -s -L https://raw.githubusercontent.com/moovweb/gvm/master/binscripts/gvm-installer)
+    bash < <(curl -s -S -L https://raw.githubusercontent.com/moovweb/gvm/master/binscripts/gvm-installer)
 
 Installing Go
 =============

README.md

@@ -26,7 +26,7 @@ Installing
 
 To install:
 
-    bash < <(curl -s -L https://raw.githubusercontent.com/moovweb/gvm/master/binscripts/gvm-installer)
+    bash < <(curl -s -S -L https://raw.githubusercontent.com/moovweb/gvm/master/binscripts/gvm-installer)
 
 Installing Go
 =============

bin/gvm

@@ -1,5 +1,9 @@
 #!/usr/bin/env bash
 
+[ -n "$GVM_DEBUG" ] && {
+  set -x
+}
+
 if [ -z "$GVM_ROOT" ]; then
 	tput sgr0
 	tput setaf 1

binscripts/gvm-installer

@@ -59,7 +59,7 @@ SRC_REPO=${SRC_REPO:-https://github.com/moovweb/gvm.git}
 
 GIT_ROOT=$(git rev-parse --show-toplevel 2>/dev/null)
 
-if [[ -z "$GIT_ROOT" ]]
+if [[ -z "$GIT_ROOT" || "$(basename "$GIT_ROOT")" != "gvm" ]]
 then
   echo "Cloning from $SRC_REPO to $GVM_DEST/$GVM_NAME"
 

tests/gvm_install_comment_test.sh

@@ -1,9 +0,0 @@
-source $GVM_ROOT/scripts/gvm
-gvm install 1.2 #status=0
-gvm list #status=0; match=/1\.2/
-gvm install go1.2 #status=0
-gvm list #status=0; match=/go1\.2/
-gvm use 1.2 #status=0
-go version #status=0; match=/1\.2/
-gvm use go1.2 #status=0
-go version #status=0; match=/go1\.2/