Bugfix: default server name is "innisfree"

Recent changes introduced a regression, where the default server name
would be "innisfree-innisfree" rather than just "innisfree" if no
`--name` arg was passed.

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## 0.2.10
 
 * Support multiple tunnels on same host
+* Bugfix: default server name is `innisfree` again, (was briefly `innisfree-innisfree`)
 * Dev only: more explicit typing for IP addresses throughout
 
 ## 0.2.9

TODO.md

@@ -61,3 +61,4 @@
 * [x] Use std::net::IpAddr
 * [x] Use std::net::SocketAddr
 * [x] Support multiple tunnels on same host
+* [x] Make default name simply "innisfree", not "innisfree-innisfree"

src/config.rs

@@ -67,6 +67,9 @@ pub fn clean_config_dir(service_name: &str) {
 /// Adds a prefix "innisfree-" if it does not exist.
 pub fn clean_name(name: &str) -> String {
     let mut orig = String::from(name);
+    if orig == "innisfree" {
+        return orig;
+    }
     orig = orig.replace("-innisfree", "");
     orig = orig.replace("innisfree-", "");
     let mut result = String::from("innisfree-");
@@ -125,5 +128,9 @@ mod tests {
         let s_complex = "foo-innisfree";
         let r_complex = clean_name(s_complex);
         assert!(r_complex == *"innisfree-foo");
+
+        let s_default = "innisfree";
+        let r_default = clean_name(s_default);
+        assert!(r_default == *"innisfree");
     }
 }