diff --git a/Programming/anaconda/files/admintools/conda_setup.sh b/Programming/anaconda/files/admintools/conda_setup.sh deleted file mode 100644 index 6ff904f..0000000 --- a/Programming/anaconda/files/admintools/conda_setup.sh +++ /dev/null @@ -1,14 +0,0 @@ -# simulate `conda init` type hook -# Expects CONDA_EXE and CONDA_PREFIX to be set -__conda_setup="$("${CONDA_EXE:-conda}" 'shell.bash' 'hook' 2> /dev/null)" -if [ $? -eq 0 ]; then - eval "$__conda_setup" -else - if [ -f "${CONDA_PREFIX:?CONDA_PREFIX not set}/etc/profile.d/conda.sh" ]; then - . "${CONDA_PREFIX}/etc/profile.d/conda.sh" - else - export PATH="${CONDA_PREFIX}/bin:$PATH" - fi -fi -unset __conda_setup - diff --git a/Programming/anaconda/modulefile b/Programming/anaconda/modulefile index 3afbc1c..899b652 100644 --- a/Programming/anaconda/modulefile +++ b/Programming/anaconda/modulefile @@ -57,8 +57,7 @@ switch [module-info mode] { # but we need to prevent conflicts with a conda from a different source. # puts stderr "DEBUG: Using conda from $P/$V\n" - #puts stdout "source \"$PREFIX/conda/etc/profile.d/conda.sh\";\n" - puts stdout "source $PREFIX/admintools/conda_setup.sh;\n" + puts stdout "source \"$PREFIX/conda/etc/profile.d/conda.sh\";\n" # Activate base? No: anaconda should just provide the conda tool #puts stdout "conda activate;\n"