do not get cwd if not env set

Signed-off-by: Antonio Murdaca <[email protected]>

Author: runcom

src/rustup-utils/src/errors.rs

@@ -156,6 +156,9 @@ error_chain! {
             description("failed to set permissions")
             display("failed to set permissions for '{}'", path.display())
         }
+        GettingCwd {
+            description("couldn't get current working directory")
+        }
         CargoHome {
             description("couldn't find value of CARGO_HOME")
         }

src/rustup-utils/src/utils.rs

@@ -546,10 +546,15 @@ pub fn cargo_home() -> Result<PathBuf> {
         None
     };
 
-    let cwd = try!(env::current_dir().chain_err(|| ErrorKind::CargoHome));
-    let cargo_home = env_var.clone().map(|home| {
-        cwd.join(home)
-    });
+    let cargo_home = if env_var.is_some() {
+        let cwd = try!(env::current_dir().chain_err(|| ErrorKind::GettingCwd));
+        env_var.clone().map(|home| {
+            cwd.join(home)
+        })
+    } else {
+        None
+    };
+
     let user_home = home_dir().map(|p| p.join(".cargo"));
     cargo_home.or(user_home).ok_or(ErrorKind::CargoHome.into())
 }
@@ -739,11 +744,17 @@ pub fn rustup_home_in_user_dir() -> Result<PathBuf> {
 
 pub fn rustup_home() -> Result<PathBuf> {
     let use_rustup_dir = do_rustup_home_upgrade();
+    let rustup_home_env = env::var_os("RUSTUP_HOME");
+
+    let rustup_home = if rustup_home_env.is_some() {
+        let cwd = try!(env::current_dir().chain_err(|| ErrorKind::GettingCwd));
+        rustup_home_env.clone().map(|home| {
+            cwd.join(home)
+        })
+    } else {
+        None
+    };
 
-    let cwd = try!(env::current_dir().chain_err(|| ErrorKind::RustupHome));
-    let rustup_home = env::var_os("RUSTUP_HOME").map(|home| {
-        cwd.join(home)
-    });
     let user_home = if use_rustup_dir {
         dot_dir(".rustup")
     } else {

tests/cli-rustup.rs

@@ -856,6 +856,18 @@ fn multirust_dir_upgrade_rename_multirust_dir_to_rustup() {
     });
 }
 
+#[test]
+fn rustup_from_non_existing_path() {
+    setup(&|config| {
+        let non_existing_dir = config.homedir.join(".remove_me");
+        let mut cmd = clitools::cmd(config, "rustup", &["-h"]);
+        cmd.env_remove("CARGO_HOME");
+        cmd.current_dir(non_existing_dir);
+        assert!(cmd.output().unwrap().status.success());
+        //expect_ok(config, &["rustup", "-h"]);
+    });
+}
+
 // Renaming ~/.multirust to ~/.rustup but ~/.rustup/rustup-version (rustup.sh) exists
 #[test]
 fn multirust_dir_upgrade_old_rustup_exists() {