haskal
/
starship
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix(context): remove unwrap when pwd is unavailable (#2520)

This commit is contained in:
David Knaack 2021-03-27 16:46:05 +01:00 committed by GitHub
parent c8a787475c
commit cf68f54611
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/context.rs
View File

@ -66,7 +66,10 @@ impl<'a> Context<'a> {
let path = arguments
.value_of("path")
.map(PathBuf::from)
.unwrap_or_else(|| env::current_dir().expect("Unable to identify current directory"));
.or_else(|| env::current_dir().ok())
.or_else(|| env::var("PWD").map(PathBuf::from).ok())
.or_else(|| arguments.value_of("logical_path").map(PathBuf::from))
.unwrap_or_default();
// Retrive the "logical directory".
// If the path argument is not set fall back to the PWD env variable set by many shells
@ -74,12 +77,8 @@ impl<'a> Context<'a> {
let logical_path = arguments
.value_of("logical_path")
.map(PathBuf::from)
.unwrap_or_else(|| {
env::var("PWD").map(PathBuf::from).unwrap_or_else(|err| {
log::debug!("Unable to get path from $PWD: {}", err);
path.clone()
})
});
.or_else(|| env::var("PWD").map(PathBuf::from).ok())
.unwrap_or_else(|| path.clone());
Context::new_with_shell_and_path(arguments, shell, path, logical_path)
}