clean up unwraps

src/main.rs

@@ -21,13 +21,13 @@ fn upload_config(h: &Host) -> Result<String, String> {
     let host = h.host.lock().unwrap().to_owned();
     let port = h.port;
     let username = h.username.lock().unwrap().to_owned();
-    let private_key = PathBuf::from("/Users/toby/.ssh/id_ed25519");
+    let private_key = PathBuf::from(format!("{}/.ssh/id_ed25519", env!("HOME")));
     let content = h.content.lock().unwrap();
-    let connection_string = format!("{}@{}:{}", username, host, port);
+    let connection_string = format!("{}@{}", username, host);
 
     let addr: SocketAddr = match format!("{}:{}", host, port).to_socket_addrs() {
         Ok(mut addrs) => addrs.nth(0).expect(format!("Invalid host/port in `{}:{}`", host, port).as_str()),
-        _ => return Err(connection_string)
+        Err(_) => return Err(connection_string)
     };
 
     let tcp: TcpStream = match TcpStream::connect_timeout(&addr, Duration::from_secs(3)) {
@@ -35,15 +35,22 @@ fn upload_config(h: &Host) -> Result<String, String> {
         Err(_) => return Err(connection_string)
     };
 
-    let mut sess = Session::new().unwrap();
+    let mut sess = match Session::new() {
+        Ok(s) => s,
+        Err(_) => return Err(connection_string)
+    };
 
     sess.set_tcp_stream(tcp);
-    sess.handshake().unwrap();
+
+    match sess.handshake() {
+        Ok(()) => (),
+        Err(_) => return Err(connection_string)
+    };
 
     match sess.userauth_pubkey_file(&username, None, &private_key, None) {
-        Err(_) => return Err(connection_string),
+        Ok(()) => (),
-        _ => {}
+        Err(_) => return Err(connection_string)
-    }
+    };
 
     let mut remote_file = match sess.scp_send(Path::new(".ssh").join("authorized_keys2").as_path(), 0o644, content.len() as u64, None) {
         Ok(rf) => rf,
@@ -55,16 +62,31 @@ fn upload_config(h: &Host) -> Result<String, String> {
         Err(_) => return Err(connection_string)
     };
 
-    remote_file.send_eof().unwrap();
+    match remote_file.send_eof() {
-    remote_file.wait_eof().unwrap();
+        Ok(()) => (),
-    remote_file.close().unwrap();
+        Err(_) => return Err(connection_string)
-    remote_file.wait_close().unwrap();
+    };
+
+    match remote_file.wait_eof() {
+        Ok(()) => (),
+        Err(_) => return Err(connection_string)
+    };
+
+    match remote_file.close() {
+        Ok(()) => (),
+        Err(_) => return Err(connection_string)
+    };
+
+    match remote_file.wait_close() {
+        Ok(()) => (),
+        Err(_) => return Err(connection_string)
+    };
 
     Ok(connection_string)
 }
 
 fn generate_authorized_keys(host_keys: Vec<String>) -> String {
-    format!("###\n# Warning this file has been generated and will be overwritten!\n###\n{}\n", host_keys.join("\n"))
+    format!("###\n# Warning this file has been generated and will be overwritten!\n###\n\n{}\n", host_keys.join("\n"))
 }
 
 fn main() {
@@ -81,7 +103,7 @@ fn main() {
             if user_data.contains_key("groups") {
                 for group in user_data["groups"].as_slice() {
                     if !config.groups.contains_key(group) {
-                        eprintln!("\x1b[93mWARNING\x1b[0m: Key-group \"{}\" not found! Skipping...", group);
+                        println!("WARNING: Key-group \"{}\" not found!", group);
                         continue;
                     }
                     for key_name in config.groups[group].as_slice() {
@@ -95,7 +117,7 @@ fn main() {
             if user_data.contains_key("keys") {
                 for key_name in user_data["keys"].as_slice() {
                     if !config.keys.contains_key(key_name) {
-                        eprintln!("\x1b[93mWARNING\x1b[0m: Key \"{}\" not found! Skipping...", key_name);
+                        println!("WARNING: Key \"{}\" not found!", key_name);
                         continue;
                     }
                     host_keys.push(config.keys.get(key_name).unwrap().to_string())