Commit f695b5b6 authored by bliven_s's avatar bliven_s

Merge branch 'conda-setup' into 'master'

Reverting bad conda_setup script

See merge request Pmodules/buildblocks!130
parents 6026d729 1668e1d3
# 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
......@@ -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"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment