RF: Use $FSLDIR/etc/fslversion to detect an official installation. Don't

activate conda environment in fsl-devel.sh

etc/fslconf/fsl-devel.sh

@@ -10,15 +10,6 @@
 #   source $FSLDIR/etc/fslconf/fsl-devel.sh
 #
 
-# If this is an official (fslinstaller-installed)
-# FSL installation, we activate the $FSLDIR conda
-# environment so that we have access to its compiler
-# toolchain (if one is installed).
-if [ -f "$FSLDIR/share/fsl/base_environment" ]; then
-  baseenv=$(cat "$FSLDIR/share/fsl/base_environment")
-  source $baseenv/bin/activate $FSLDIR
-fi
-
 # FSLCONFDIR contains the FSL Makefile machinery
 # for compiling and installing FSL Makefile-based
 # projects.

etc/fslconf/fsl.sh

@@ -14,23 +14,21 @@
 
 #### Set up standard FSL user environment variables ####
 
-# If this is an official (fslinstaller-installed)
-# FSL installation, wrappers to FSL executables
-# will have been created in $FSLDIR/share/fsl/bin/
-# We add this to the $PATH, rather than adding
-# $FSLDIR/bin/ to the path, to avoid clobbering
-# the user's environment with other executalbes
-# that have been installed into $FSLDIR/bin/ (e.g.
-# python).
+# If this is an official (fslinstaller-installed) FSL
+# installation, wrappers to FSL executables will have
+# been created in $FSLDIR/share/fsl/bin/ We add this to
+# the $PATH, rather than adding $FSLDIR/bin/ to the
+# path, to avoid clobbering the user's environment with
+# other executalbes that have been installed into
+# $FSLDIR/bin/ (e.g.  python).
 #
 # The fslinstaller creates a file called
-# base_environment when it installs official
-# FSL installations.
+# $FSLDIR/etc/fslversion when it installs official FSL
+# installations.
 #
-# If this is a manually managed installation, it
-# is the user's responsibility to add $FSLDIR/bin
-# to the $PATH
-if [ -f "$FSLDIR/share/fsl/base_environment" ]; then
+# If this is a manually managed installation, it is the
+# user's responsibility to add $FSLDIR/bin to the $PATH
+if [ -f "$FSLDIR/etc/fslversion" ]; then
   export PATH=$FSLDIR/share/fsl/bin:$PATH
 fi