From fcb50e7f01a0ab281c7c4881efe67b7459bebd23 Mon Sep 17 00:00:00 2001
From: Marco Vermeulen <vermeulen.mp@gmail.com>
Date: Wed, 17 Apr 2013 10:16:02 +0100
Subject: [PATCH] Fix breakage on migration of legacy vertx installs.

---
 src/main/bash/selfupdate.sh                  | 2 +-
 src/test/cucumber/gvm/self_update.feature    | 1 +
 src/test/steps/gvm/installation_steps.groovy | 6 ++++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/bash/selfupdate.sh b/src/main/bash/selfupdate.sh
index d5546698..f7c13bd8 100755
--- a/src/main/bash/selfupdate.sh
+++ b/src/main/bash/selfupdate.sh
@@ -65,7 +65,7 @@ mkdir -p "${GVM_DIR}/gradle"
 mkdir -p "${GVM_DIR}/griffon"
 mkdir -p "${GVM_DIR}/grails"
 
-if [[ -d "${GVM_DIR}/vert.x" ]]; then
+if [[ -d "${GVM_DIR}/vert.x" && ! -d "${GVM_DIR}/vertx" ]]; then
 	mv "${GVM_DIR}/vert.x" "${GVM_DIR}/vertx"
 else
 	mkdir -p "${GVM_DIR}/vertx"
diff --git a/src/test/cucumber/gvm/self_update.feature b/src/test/cucumber/gvm/self_update.feature
index 89d576f5..44d516ba 100644
--- a/src/test/cucumber/gvm/self_update.feature
+++ b/src/test/cucumber/gvm/self_update.feature
@@ -32,6 +32,7 @@ Feature: Self Update
 
   Scenario: Rename the vertx Candidate on Upgrade
     Given the candidate "vert.x" version "1.3.0.final" is already installed and default
+    And the candidate "vertx" does not exist
     When I enter "gvm selfupdate"
     Then the candidate "vertx" version "1.3.0.final" is installed
     And the candidate "vert.x" version "1.3.0.final" is not installed
diff --git a/src/test/steps/gvm/installation_steps.groovy b/src/test/steps/gvm/installation_steps.groovy
index 731a646d..3ab7f6a5 100644
--- a/src/test/steps/gvm/installation_steps.groovy
+++ b/src/test/steps/gvm/installation_steps.groovy
@@ -50,6 +50,12 @@ Given(~'^the candidate "([^"]*)" version "([^"]*)" does not exist$') { String ca
     assert ! versions.contains(version)
 }
 
+And(~'^the candidate "([^"]*)" does not exist$') { String candidate ->
+    def candidateDir = "${gvmDir}/${candidate}" as File
+    candidateDir.deleteDir()
+    assert ! candidateDir.exists()
+}
+
 And(~'^I have a local candidate "([^"]*)" version "([^"]*)" at "([^"]*)"$') { String candidate, String version, String directory ->
     prepareLocalCandidateFolder directory, candidate, version
 }