Fix breakage on migration of legacy vertx installs.

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"

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

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
 }