Do not convert LMOD_PKG from /opt/apps/lmod/$VERSION to /opt/apps/lmod/lmod if the link exists

Author: Robert McLay

README.new

@@ -69,5 +69,6 @@ Lmod 7.7+
    (7.7.35) issue #374: convert ~ to $HOME internally.  This allows C-shell users to use ~
             inside a modulefile and have it work when unloading.
             issue #375: Support for is-loaded and is-avail added.
-            
+   (7.7.36) Do not convert LMOD_PKG from /opt/apps/lmod/7.7.35 to /opt/apps/lmod/lmod if the link exists.
+   
 

init/bash.in

@@ -16,9 +16,6 @@ fi
 [ -n "${__lmod_vx}" ] && set +$__lmod_vx 
 
 export LMOD_PKG=@PKGV@
-if [ "${LMOD_PKG##*/}" != "lmod" -a -L $LMOD_PKG/../lmod ]; then
-    LMOD_PKG=${LMOD_PKG%/*}/lmod
-fi
 
 if [ -n "${__lmod_vx}" ]; then
     echo "Shell debugging temporarily silenced: export LMOD_SH_DBG_ON=1 for this output ($LMOD_PKG/init/bash)"

init/csh.in

@@ -1,10 +1,5 @@
 #!/bin/csh
 setenv LMOD_PKG                  "@PKGV@"
-set lastdir = `echo $LMOD_PKG | sed -e 's|.*/||'`
-if ( $lastdir != "lmod" && -f $LMOD_PKG/../lmod ) then
-   set dir = `echo  $LMOD_PKG | sed -e 's|/[^/]*$|/|g'`
-   setenv LMOD_PKG               "$dir/lmod"
-endif
 setenv LMOD_CMD                  "$LMOD_PKG/libexec/lmod"
 setenv LMOD_DIR                  "$LMOD_PKG/libexec"
 setenv MODULESHOME               "$LMOD_PKG"