.profile and if zsh .zprofile

rust-lang · Mar 27, 2017 · 073e6e7 · 073e6e7
1 parent aa3c0b0
commit 073e6e7
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/rustup-cli/self_update.rs b/src/rustup-cli/self_update.rs
@@ -978,16 +978,20 @@ fn get_add_path_methods() -> Vec<PathUpdateMethod> {
         return vec![PathUpdateMethod::Windows];
     }
 
-    let mut profile_name = ".profile";
+    let profile_name = ".profile";
+
+    let profile = utils::home_dir().map(|p| p.join(profile_name));
+    let mut profiles = vec![profile];
+
     if let Ok(shell) = env::var("SHELL") {
         if shell.contains("zsh") {
-            profile_name = ".zprofile";
+            let zprofile_name = ".zprofile";
+            let zprofile = utils::home_dir().map(|p| p.join(zprofile_name));
+            profiles.push(zprofile);
         }
     }
 
-    let profile = utils::home_dir().map(|p| p.join(profile_name));
-    let rcfiles = vec![profile].into_iter().filter_map(|f|f);
-
+    let rcfiles = profiles.into_iter().filter_map(|f|f);
     rcfiles.map(PathUpdateMethod::RcFile).collect()
 }