Reverting bad conda_setup script
This broke anaconda because the CONDA_PREFIX is not defined. Better to setup conda directly in the modulefile.
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user