admin/topgrade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: oh-my-zsh step issue #646 (#647)

Browse Source
This commit is contained in:
SteveLauC
2024-01-22 09:18:27 +08:00
committed by GitHub
parent dadffb1081
commit bf72d7bb5a
1 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/steps/zsh.rs
View File

@@ -179,25 +179,15 @@ pub fn run_oh_my_zsh(ctx: &ExecutionContext) -> Result<()> {
// children processes won't get it either, so we source the zshrc and set // children processes won't get it either, so we source the zshrc and set
// the ZSH variable for topgrade here. // the ZSH variable for topgrade here.
if ctx.under_ssh() { if ctx.under_ssh() {
let zshrc_path = zshrc().require()?; let res_env_zsh = Command::new("zsh")
let output = Command::new("zsh") .args(["-ic", "print -rn -- ${ZSH:?}"])
.args([ .output_checked_utf8();
"-c",
// ` > /dev/null` is used in case the user's zshrc will have some stdout output.
format!("source {} > /dev/null && export -p", zshrc_path.display()).as_str(),
])
.output_checked_utf8()?;
let stdout = output.stdout; // this command will fail if `ZSH` is not set
if let Ok(output) = res_env_zsh {
let prefix = "export ZSH="; let env_zsh = output.stdout;
for line in stdout.lines() { debug!("Oh-my-zsh: under SSH, setting ZSH={}", env_zsh);
if line.contains(prefix) { env::set_var("ZSH", env_zsh);
let zsh_env = line.trim_start_matches(prefix);
debug!("Oh-my-zsh: under SSH, setting ZSH={}", zsh_env);
env::set_var("ZSH", zsh_env);
break;
}
} }
} }