diff --git a/CHANGELOG.md b/CHANGELOG.md index fd9a77f..ecee56c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -142,6 +142,18 @@ ## Version 1.1.5 * first public version with the overlay feature +## Version 1.0.0rc11 +* **modulecmd** + * *User visible changes* + * handling of set-alias in modulefile fixed + * *Internal changes and fixes* + * none +* **build-system** + * *User visible changes* + * none + * *Internal changes and fixes* + * none + ## Version 1.0.0rc10 * **modulecmd** * *User visible changes* diff --git a/Pmodules/libstd.bash b/Pmodules/libstd.bash index eb3b6ba..0b5121a 100644 --- a/Pmodules/libstd.bash +++ b/Pmodules/libstd.bash @@ -302,11 +302,11 @@ std.get_os_release_linux() { std::die 4 "Cannot determin OS release!\n" fi - case "${ID}" in - RedHatEnterpriseServer | RedHatEnterprise | Scientific | rhel | centos | CentOS | fedora ) + case "${ID,,}" in + redhatenterpriseserver | redhatenterprise | scientific | springdale | rhel | centos | fedora ) echo "rhel${VERSION_ID%%.*}" ;; - Ubuntu ) + ubuntu ) echo "Ubuntu${VERSION_ID%.*}" ;; * ) diff --git a/Pmodules/modulecmd.bash.in b/Pmodules/modulecmd.bash.in index 16bbdae..b35fa96 100644 --- a/Pmodules/modulecmd.bash.in +++ b/Pmodules/modulecmd.bash.in @@ -1959,7 +1959,7 @@ subcommand_purge() { # re-run with right shell "${modulecmd}" "${Shell}" 'purge' fi - eval "${output}" + eval "$(echo "${output}"|sed -e 's/;unalias [^;]*//g')" if [[ -n "${error}" ]]; then echo "${error}" 1>&2 fi diff --git a/config/versions.conf b/config/versions.conf new file mode 100644 index 0000000..5ffc722 --- /dev/null +++ b/config/versions.conf @@ -0,0 +1,9 @@ +bash 5.1 +coreutils 8.31 +findutils 4.7.0 +getopt 1.1.6 +gettext 0.21 +modules 3.2.10.1 +Pmodules 1.0.0rc12 +Tcl 8.6.10 +tcllib 1.20