From b3840877b9c1ee45a14f9cbb780480982653b328 Mon Sep 17 00:00:00 2001 From: Wolf Vollprecht Date: Tue, 20 Jun 2023 11:34:10 +0200 Subject: [PATCH 1/2] zsh also uses `sh` as shell extension --- crates/rattler_shell/src/shell/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/rattler_shell/src/shell/mod.rs b/crates/rattler_shell/src/shell/mod.rs index 9334d07ed..3148587c9 100644 --- a/crates/rattler_shell/src/shell/mod.rs +++ b/crates/rattler_shell/src/shell/mod.rs @@ -150,7 +150,7 @@ impl Shell for Zsh { } fn extension(&self) -> &str { - "zsh" + "sh" } fn create_run_script_command(&self, path: &Path) -> Command { From 94e3ad2492c51efa80eb92de9a1036efdb65368a Mon Sep 17 00:00:00 2001 From: Wolf Vollprecht Date: Wed, 21 Jun 2023 09:55:00 +0200 Subject: [PATCH 2/2] fix test --- .../rattler_shell__activation__tests__activation_script_zsh.snap | 1 + 1 file changed, 1 insertion(+) diff --git a/crates/rattler_shell/src/snapshots/rattler_shell__activation__tests__activation_script_zsh.snap b/crates/rattler_shell/src/snapshots/rattler_shell__activation__tests__activation_script_zsh.snap index 46c02f85d..a87fb2761 100644 --- a/crates/rattler_shell/src/snapshots/rattler_shell__activation__tests__activation_script_zsh.snap +++ b/crates/rattler_shell/src/snapshots/rattler_shell__activation__tests__activation_script_zsh.snap @@ -4,4 +4,5 @@ expression: script --- export PATH="__PREFIX__/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin" export CONDA_PREFIX="__PREFIX__" +. "__PREFIX__/etc/conda/activate.d/script1.sh"