From 1668e1d3fa5539598c3e1910c9822f9a13022e8a Mon Sep 17 00:00:00 2001
From: Spencer Bliven <spencer.bliven@gmail.com>
Date: Wed, 28 Oct 2020 11:13:17 +0100
Subject: [PATCH] Reverting bad conda_setup script

This broke anaconda because the CONDA_PREFIX is not defined.
Better to setup conda directly in the modulefile.
---
 .../anaconda/files/admintools/conda_setup.sh       | 14 --------------
 Programming/anaconda/modulefile                    |  3 +--
 2 files changed, 1 insertion(+), 16 deletions(-)
 delete mode 100644 Programming/anaconda/files/admintools/conda_setup.sh

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"