Merge branch '125-rename-variable-defaultusedreleasestages-to-defaultreleasestages' into 'master'

Resolve "rename variable DefaultUsedReleaseStages to DefaultReleaseStages"

Closes #125

See merge request Pmodules/src!94
This commit is contained in:
2021-05-26 17:48:27 +02:00
6 changed files with 11 additions and 11 deletions
+1 -1
View File
@@ -5,4 +5,4 @@ DefaultGroups='Tools Programming'
ReleaseStages=':unstable:stable:deprecated:'
# set releases which should be available after initialization
DefaultUsedReleaseStages='stable'
DefaultReleaseStages='stable'
+3 -3
View File
@@ -114,7 +114,7 @@ save_env() {
[[ $1 == 'no' ]] && return 0
local vars=( Version GroupDepths UsedReleases UseFlags UsedGroups )
vars+=( DefaultGroups ReleaseStages )
vars+=( DefaultUsedReleaseStages )
vars+=( DefaultReleaseStages )
local s=$(typeset -p ${vars[@]})
declare -g PMODULES_ENV=$( "${base64}" --wrap=0 <<< "$s" )
@@ -1381,7 +1381,7 @@ reset_used_groups() {
reset_used_releases() {
declare -g UsedReleases=''
for r in ${DefaultUsedReleaseStages//:/ }; do
for r in ${DefaultReleaseStages//:/ }; do
std::append_path UsedReleases "${r}"
done
g_env_must_be_saved='yes'
@@ -2288,7 +2288,7 @@ if [[ -n ${PMODULES_ENV} ]]; then
declare -g Version="${PMODULES_VERSION}"
g_env_must_be_saved='yes'
fi
if [[ -v DefaultGroups ]] || [[ -v DefaultUsedReleaseStages ]] || [[ -v ReleaseStages ]]; then
if [[ -v DefaultGroups ]] || [[ -v DefaultReleaseStages ]] || [[ -v ReleaseStages ]]; then
source "${pmodules_config_file}" || \
std::die 3 "Oops: cannot parse config file -- %s\n" \
"${pmodules_config_file}"
+1 -1
View File
@@ -1,7 +1,7 @@
#!/bin/tcsh
setenv DefaultGroups 'Tools Programming'
setenv DefaultUsedReleaseStages 'stable'
setenv DefaultReleaseStages 'stable'
if ( ! $?PMODULES_VERSION ) then
setenv PMODULES_VERSION "@PMODULES_VERSION@"
endif
+2 -2
View File
@@ -8,11 +8,11 @@
#
declare -xa DefaultGroups
declare -xa DefaultUsedReleaseStages
declare -xa DefaultReleaseStages
declare -x PMODULES_VERSION
: ${DefaultGroups:=(Tools Programming)}
: ${DefaultUsedReleaseStages:=(stable)}
: ${DefaultReleaseStages:=(stable)}
: ${PMODULES_VERSION:=@PMODULES_VERSION@}
#############################################################################
+3 -3
View File
@@ -78,14 +78,14 @@ done
# build initial list of used releases
declare -x UsedReleases=''
typeset -T UsedReleases usedreleases
for r in ${DefaultUsedReleaseStages[@]}; do
for r in ${DefaultReleaseStages[@]}; do
usedreleases=( "${r}" ${(m)usedreleases:#${r}} )
done
eval $(save_env UsedReleases DefaultUsedReleaseStages DefaultGroups ReleaseStages)
eval $(save_env UsedReleases DefaultReleaseStages DefaultGroups ReleaseStages)
unset UsedReleases
unset DefaultUsedReleaseStages
unset DefaultReleaseStages
unset DefaultGroups
unset ReleaseStages
+1 -1
View File
@@ -14,5 +14,5 @@ declare -x PMODULES_HOME="${PMODULES_ROOT}/Tools/Pmodules/${PMODULES_VERSION}"
declare -x DefaultGroups='Tools Programming'
declare ReleaseStages=':unstable:stable:deprecated:'
declare DefaultUsedReleaseStages='stable'
declare DefaultReleaseStages='stable'