Do the same thing with less duplication

Author: Caspar van Leeuwen

EESSI-extend-easybuild.eb

@@ -211,23 +211,12 @@ end
 easybuild_version = os.getenv("EBVERSIONEASYBUILD") or easybuild_version
 eessi_version = os.getenv("EESSI_VERSION") or "2023.06"
 
-if (mode() == "unload") then
-  -- unload unconditionally, so that even if EB versions were switched in the meantime, this gets unset
-  -- This avoids issues where EESSI-extend is first loaded with EB => 5.1 (which set these vars)
-  -- but then EB is swapped for a version < 5.1 and then EESSI-extend is unloaded (which would not unset
-  -- these vars if we did it conditional on the EB version)
-  setenv ("EASYBUILD_STRICT_RPATH_SANITY_CHECK", "1")
-  setenv ("EASYBUILD_CUDA_SANITY_CHECK_ERROR_ON_FAILED_CHECKS", "1")
-  setenv ("EASYBUILD_FAIL_ON_MOD_FILES_GCCCORE", "1")
-  setenv ("EASYBUILD_LOCAL_VAR_NAMING_CHECK", "error")
-  -- This can still be conditional, eessi_version is always set
-  if convertToCanonical(eessi_version) > convertToCanonical("2023.06") then
-    setenv ("EASYBUILD_PREFER_PYTHON_SEARCH_PATH", "EBPYTHONPREFIXES")
-    setenv ("EASYBUILD_MODULE_SEARCH_PATH_HEADERS", "include_paths")
-    setenv ("EASYBUILD_SEARCH_PATH_CPP_HEADERS", "include_paths")
-  end
 -- Set environment variables that are EasyBuild version specific
-elseif convertToCanonical(easybuild_version) >= convertToCanonical("5.1") then
+-- Do unload unconditionally, so that even if EB versions were switched in the meantime, this gets unset
+-- This avoids issues where EESSI-extend is first loaded with EB => 5.1 (which set these vars)
+-- but then EB is swapped for a version < 5.1 and then EESSI-extend is unloaded (which would not unset
+-- these vars if we did it conditional on the EB version)
+if convertToCanonical(easybuild_version) >= convertToCanonical("5.1") or mode() == "unload" then
   setenv ("EASYBUILD_STRICT_RPATH_SANITY_CHECK", "1")
   setenv ("EASYBUILD_CUDA_SANITY_CHECK_ERROR_ON_FAILED_CHECKS", "1")
   setenv ("EASYBUILD_FAIL_ON_MOD_FILES_GCCCORE", "1")