Merge pull request #2123 from kinnison/kinnison/cleanup-no-cwd-message

Improve the reporting when CWD is invalid

Author: kinnison

src/cli/main.rs

@@ -31,6 +31,7 @@ mod topical_doc;
 
 use crate::errors::*;
 use rustup::env_var::RUST_RECURSION_COUNT_MAX;
+use rustup::utils::utils;
 
 use std::env;
 use std::path::PathBuf;
@@ -60,6 +61,11 @@ fn run_rustup_inner() -> Result<()> {
     // bugs in rustup.
     do_recursion_guard()?;
 
+    // Before we do anything else, ensure we know where we are and who we
+    // are because otherwise we cannot proceed usefully.
+    utils::current_dir()?;
+    utils::current_exe()?;
+
     // The name of arg0 determines how the program is going to behave
     let arg0 = match env::var("RUSTUP_FORCE_ARG0") {
         Ok(v) => Some(v),

src/errors.rs

@@ -32,7 +32,7 @@ error_chain! {
 
     errors {
         LocatingWorkingDir {
-            description("could not locate working directory")
+            description("Unable to proceed. Could not locate working directory.")
         }
         ReadingFile {
             name: &'static str,
@@ -177,9 +177,6 @@ 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")
         }