extern/atuin
1
0
Fork 0
mirror of https://github.com/atuinsh/atuin.git synced 2024-11-22 16:23:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: support not-mac for default shell (#1960)

Browse Source
This commit is contained in:
Ellie Huxtable 2024-04-19 09:58:25 +01:00 committed by GitHub
parent 00dfc034ed
commit 98350f52df
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
crates/atuin-common/src/shell.rs
View File

@ -67,26 +67,25 @@ impl Shell {
// TODO: Support Linux // TODO: Support Linux
// I'm pretty sure we can use /etc/passwd there, though there will probably be some issues // I'm pretty sure we can use /etc/passwd there, though there will probably be some issues
if sys.contains("darwin") { let path = if sys.contains("darwin") {
// This works in my testing so far // This works in my testing so far
let path = Shell::Sh.run_interactive([ Shell::Sh.run_interactive([
"dscl localhost -read \"/Local/Default/Users/$USER\" shell | awk '{print $2}'", "dscl localhost -read \"/Local/Default/Users/$USER\" shell | awk '{print $2}'",
])?; ])?
let path = Path::new(path.trim());
let shell = path.file_name();
if shell.is_none() {
return Err(ShellError::NotSupported);
}
Ok(Shell::from_string(
shell.unwrap().to_string_lossy().to_string(),
))
} else { } else {
Err(ShellError::NotSupported) Shell::Sh.run_interactive(["getent passwd $LOGNAME | cut -d: -f7"])?
};
let path = Path::new(path.trim());
let shell = path.file_name();
if shell.is_none() {
return Err(ShellError::NotSupported);
} }
Ok(Shell::from_string(
shell.unwrap().to_string_lossy().to_string(),
))
} }
pub fn from_string(name: String) -> Shell { pub fn from_string(name: String) -> Shell {