mirror of
https://github.com/Pmodules/Pmodules.git
synced 2026-06-28 18:29:39 +02:00
refactor variable PMODULES_DEFINED_RELEASES
- new name is ReleaseStages - new name is ReleaseStages
This commit is contained in:
@@ -1302,7 +1302,7 @@ pbuild.build_module() {
|
||||
build_dependency() {
|
||||
local -r m=$1
|
||||
std::debug "${m}: module not available"
|
||||
local rels=( ${PMODULES_DEFINED_RELEASES//:/ } )
|
||||
local rels=( ${ReleaseStages//:/ } )
|
||||
[[ ${dry_run} == yes ]] && \
|
||||
std::die 1 \
|
||||
"%s " \
|
||||
|
||||
@@ -38,7 +38,7 @@ fi
|
||||
|
||||
source "${libdir}/libstd.bash"
|
||||
|
||||
: ${PMODULES_DEFINED_RELEASES:=':unstable:stable:deprecated:'}
|
||||
: ${ReleaseStages:=':unstable:stable:deprecated:'}
|
||||
|
||||
declare -r version='@PMODULES_VERSION@'
|
||||
|
||||
@@ -103,7 +103,7 @@ declare g_env_must_be_saved='no'
|
||||
save_env() {
|
||||
[[ $1 == 'no' ]] && return 0
|
||||
local vars=( Version GroupDepths UsedReleases UseFlags UsedGroups )
|
||||
vars+=( PMODULES_DEFAULT_GROUPS PMODULES_DEFINED_RELEASES )
|
||||
vars+=( PMODULES_DEFAULT_GROUPS ReleaseStages )
|
||||
vars+=( PMODULES_DEFAULT_RELEASES )
|
||||
|
||||
local s=$(typeset -p ${vars[@]})
|
||||
@@ -151,7 +151,7 @@ get_release() {
|
||||
}
|
||||
|
||||
is_release() {
|
||||
[[ ${PMODULES_DEFINED_RELEASES} =~ :$1: ]]
|
||||
[[ ${ReleaseStages} =~ :$1: ]]
|
||||
}
|
||||
|
||||
#
|
||||
@@ -937,7 +937,7 @@ subcommand_avail() {
|
||||
print_help "${subcommand}"
|
||||
;;
|
||||
-a | --all | --all-releases )
|
||||
opt_use_releases="${PMODULES_DEFINED_RELEASES}"
|
||||
opt_use_releases="${ReleaseStages}"
|
||||
;;
|
||||
-h | --human )
|
||||
output_function='human_readable_output'
|
||||
@@ -1095,7 +1095,7 @@ subcommand_use() {
|
||||
std::info "\t${r}"
|
||||
done
|
||||
std::info "\nUnused releases:"
|
||||
for r in ${PMODULES_DEFINED_RELEASES//:/ }; do
|
||||
for r in ${ReleaseStages//:/ }; do
|
||||
if ! release_is_used $r; then
|
||||
std::info "\t${r}"
|
||||
fi
|
||||
@@ -1916,7 +1916,7 @@ subcommand_search() {
|
||||
done
|
||||
;;
|
||||
-a | --all-releases )
|
||||
opt_use_releases="${PMODULES_DEFINED_RELEASES}"
|
||||
opt_use_releases="${ReleaseStages}"
|
||||
;;
|
||||
--src )
|
||||
# :FIXME: do we have to add some sanity checks here?
|
||||
|
||||
@@ -27,7 +27,7 @@ export PMODULES_DEFAULT_RELEASES
|
||||
export PMODULES_VERSION
|
||||
|
||||
declare -x PMODULES_MODULEFILES_DIR='modulefiles'
|
||||
declare -x PMODULES_DEFINED_RELEASES=':unstable:stable:deprecated:'
|
||||
declare -x ReleaseStages=':unstable:stable:deprecated:'
|
||||
|
||||
declare -x PMODULES_ROOT=$(cd $(dirname "${BASH_SOURCE}")/.. && pwd)
|
||||
declare -x PMODULES_CONFIG_DIR=$(basename $(cd $(dirname "${BASH_SOURCE}") && pwd))
|
||||
|
||||
@@ -14,7 +14,7 @@ endif
|
||||
#############################################################################
|
||||
|
||||
setenv PMODULES_MODULEFILES_DIR 'modulefiles'
|
||||
setenv PMODULES_DEFINED_RELEASES ':unstable:stable:deprecated:'
|
||||
setenv ReleaseStages ':unstable:stable:deprecated:'
|
||||
|
||||
setenv PMODULES_ROOT "@PMODULES_ROOT@"
|
||||
setenv PMODULES_CONFIG_DIR 'config'
|
||||
|
||||
@@ -20,7 +20,7 @@ declare -x PMODULES_VERSION
|
||||
#############################################################################
|
||||
|
||||
declare -x PMODULES_MODULEFILES_DIR='modulefiles'
|
||||
declare -x PMODULES_DEFINED_RELEASES=':unstable:stable:deprecated:'
|
||||
declare -x ReleaseStages=':unstable:stable:deprecated:'
|
||||
|
||||
declare -x PMODULES_ROOT=$(cd $(dirname "${(%):-%N}")/.. && pwd)
|
||||
declare -x PMODULES_CONFIG_DIR=$(basename $(cd $(dirname "${(%):-%N}") && pwd))
|
||||
|
||||
+2
-2
@@ -82,12 +82,12 @@ for r in ${PMODULES_DEFAULT_RELEASES[@]}; do
|
||||
usedreleases=( "${r}" ${(m)usedreleases:#${r}} )
|
||||
done
|
||||
|
||||
eval $(save_env UsedReleases PMODULES_DEFAULT_RELEASES PMODULES_DEFAULT_GROUPS PMODULES_DEFINED_RELEASES)
|
||||
eval $(save_env UsedReleases PMODULES_DEFAULT_RELEASES PMODULES_DEFAULT_GROUPS ReleaseStages)
|
||||
|
||||
unset UsedReleases
|
||||
unset PMODULES_DEFAULT_RELEASES
|
||||
unset PMODULES_DEFAULT_GROUPS
|
||||
unset PMODULES_DEFINED_RELEASES
|
||||
unset ReleaseStages
|
||||
|
||||
# initialize MANPATH with output of `man --path` if not set
|
||||
[[ -z "${MANPATH}" ]] && manpath=$( man --path )
|
||||
|
||||
@@ -13,6 +13,6 @@ declare -x PMODULES_MODULEFILES_DIR='modulefiles'
|
||||
declare -x PMODULES_HOME="${PMODULES_ROOT}/Tools/Pmodules/${PMODULES_VERSION}"
|
||||
|
||||
declare -x PMODULES_DEFAULT_GROUPS='Tools Programming'
|
||||
declare -x PMODULES_DEFINED_RELEASES=':unstable:stable:deprecated:'
|
||||
declare ReleaseStages=':unstable:stable:deprecated:'
|
||||
declare -x PMODULES_DEFAULT_RELEASES='stable'
|
||||
|
||||
|
||||
Reference in New Issue
Block a user