From ba0e47a9a74ea2f4b2e99ca1811bcd8460ae7a00 Mon Sep 17 00:00:00 2001
From: Marco Vermeulen <vermeulen.mp@gmail.com>
Date: Thu, 27 Dec 2012 13:56:05 +0000
Subject: [PATCH] Rename vert.x to vertx.

---
 src/main/resources/scripts/gvm-help.sh   |  2 +-
 src/main/resources/scripts/gvm-init.sh   |  4 ++--
 src/main/resources/scripts/gvm-use.sh    | 12 ++----------
 src/main/resources/scripts/install.sh    |  2 +-
 src/main/resources/scripts/selfupdate.sh |  2 +-
 5 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/src/main/resources/scripts/gvm-help.sh b/src/main/resources/scripts/gvm-help.sh
index 74d21cd3..41116d16 100644
--- a/src/main/resources/scripts/gvm-help.sh
+++ b/src/main/resources/scripts/gvm-help.sh
@@ -21,7 +21,7 @@ function __gvmtool_help {
 	echo "Usage: gvm <command> <candidate> [version]"
 	echo ""
 	echo "   command    :  install, uninstall, list, use, current, version, default, selfupdate, broadcast or help"
-	echo "   candidate  :  groovy, grails, griffon, gradle, vert.x"
+	echo "   candidate  :  groovy, grails, griffon, gradle, vertx"
 	echo "   version    :  optional, defaults to latest stable if not provided"
 	echo ""
 	echo "eg: gvm install groovy"
diff --git a/src/main/resources/scripts/gvm-init.sh b/src/main/resources/scripts/gvm-init.sh
index defead79..9ce5c400 100755
--- a/src/main/resources/scripts/gvm-init.sh
+++ b/src/main/resources/scripts/gvm-init.sh
@@ -46,7 +46,7 @@ EOF
 )
 
 OFFLINE_MESSAGE="This command is not available in aeroplane mode."
-GVM_CANDIDATES=("groovy" "grails" "griffon" "gradle" "vert.x")
+GVM_CANDIDATES=("groovy" "grails" "griffon" "gradle" "vertx")
 
 PATH="${GVM_DIR}/bin:${GVM_DIR}/ext:$PATH"
 
@@ -54,7 +54,7 @@ GROOVY_HOME="${GVM_DIR}/groovy/current"
 GRAILS_HOME="${GVM_DIR}/grails/current"
 GRIFFON_HOME="${GVM_DIR}/griffon/current"
 GRADLE_HOME="${GVM_DIR}/gradle/current"
-VERTX_HOME="${GVM_DIR}/vert.x/current"
+VERTX_HOME="${GVM_DIR}/vertx/current"
 
 export PATH="${GROOVY_HOME}/bin:${GRAILS_HOME}/bin:${GRIFFON_HOME}/bin:${GRADLE_HOME}/bin:${VERTX_HOME}/bin:$PATH"
 
diff --git a/src/main/resources/scripts/gvm-use.sh b/src/main/resources/scripts/gvm-use.sh
index 505d2dc0..622e7ed3 100644
--- a/src/main/resources/scripts/gvm-use.sh
+++ b/src/main/resources/scripts/gvm-use.sh
@@ -35,16 +35,8 @@ function __gvmtool_use {
 
 	if [[ -n ${isolated_mode} && ${isolated_mode} == 1 ]]; then
 		# Just update the *_HOME and PATH for this shell.
-		case "${CANDIDATE}" in
-			vert.x )
-			export VERTX_HOME="${GVM_DIR}/vert.x/${VERSION}"
-			;;
-
-			* )
-			UPPER_CANDIDATE=`echo "${CANDIDATE}" | tr '[:lower:]' '[:upper:]'`
-			export "${UPPER_CANDIDATE}_HOME"="${GVM_DIR}/${CANDIDATE}/${VERSION}"
-			;;
-		esac
+		UPPER_CANDIDATE=`echo "${CANDIDATE}" | tr '[:lower:]' '[:upper:]'`
+		export "${UPPER_CANDIDATE}_HOME"="${GVM_DIR}/${CANDIDATE}/${VERSION}"
 
 		# Replace the current path for the candidate with the selected version.
 		export PATH=`echo $PATH | sed -E "s!${GVM_DIR}/${CANDIDATE}/([0-9][^/]+|current)!${GVM_DIR}/${CANDIDATE}/${VERSION}!g"`
diff --git a/src/main/resources/scripts/install.sh b/src/main/resources/scripts/install.sh
index 606e11ea..a50785eb 100755
--- a/src/main/resources/scripts/install.sh
+++ b/src/main/resources/scripts/install.sh
@@ -158,7 +158,7 @@ mkdir -p "${GVM_DIR}/groovy"
 mkdir -p "${GVM_DIR}/grails"
 mkdir -p "${GVM_DIR}/griffon"
 mkdir -p "${GVM_DIR}/gradle"
-mkdir -p "${GVM_DIR}/vert.x"
+mkdir -p "${GVM_DIR}/vertx"
 
 echo "Download script archive..."
 curl -s "${GVM_SERVICE}/res?platform=${GVM_PLATFORM}" > "${gvm_zip_file}"
diff --git a/src/main/resources/scripts/selfupdate.sh b/src/main/resources/scripts/selfupdate.sh
index 0f004ce0..ab1bf57d 100755
--- a/src/main/resources/scripts/selfupdate.sh
+++ b/src/main/resources/scripts/selfupdate.sh
@@ -45,7 +45,7 @@ mkdir -p "${GVM_DIR}/groovy"
 mkdir -p "${GVM_DIR}/gradle"
 mkdir -p "${GVM_DIR}/griffon"
 mkdir -p "${GVM_DIR}/grails"
-mkdir -p "${GVM_DIR}/vert.x"
+mkdir -p "${GVM_DIR}/vertx"
 
 echo "Prime the config file..."
 gvm_config_file="${GVM_DIR}/etc/config"