From 2d4160b9bd9c92010818dcc3629b9e0220d88091 Mon Sep 17 00:00:00 2001 From: ndwarshuis Date: Fri, 26 May 2023 15:27:44 -0400 Subject: [PATCH] ENH allow zsh-conda to accept init script as arg --- dot_config/zsh/dot_zshrc.tmpl | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/dot_config/zsh/dot_zshrc.tmpl b/dot_config/zsh/dot_zshrc.tmpl index c5d5172..3f8fdb2 100644 --- a/dot_config/zsh/dot_zshrc.tmpl +++ b/dot_config/zsh/dot_zshrc.tmpl @@ -449,14 +449,22 @@ zsh-rbenv () { {{ if .development.conda -}} zsh-conda () { - if [[ -x $XDG_DATA_HOME/mambaforge/bin/conda ]]; then + if [ -n "$1" ]; then + if [ -f "$1" ]; then + source "$1" + else + echo "Could not source file at $1" + return 1 + fi + elif [ -x $XDG_DATA_HOME/mambaforge/bin/conda ]; then eval "$($XDG_DATA_HOME/mambaforge/bin/conda shell.zsh hook)" - alias cdd="conda deactivate" - alias cda="conda activate" - alias cde="conda env" - alias cdl="conda list" else echo "conda installation not found" + return 1 fi + alias cdd="conda deactivate" + alias cda="conda activate" + alias cde="conda env" + alias cdl="conda list" } {{- end }}