From a6e3a5034538c5acec6eef3c3f06fdf714a7663b Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Fri, 19 Sep 2014 13:16:22 +0200 Subject: [PATCH] change_release: opt '--from-release' removed; '--to-release' renamed to '--release' --- scripts/change_release | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/scripts/change_release b/scripts/change_release index c142219..7dff17a 100755 --- a/scripts/change_release +++ b/scripts/change_release @@ -12,20 +12,23 @@ change_release() { with_modules+=( "--with=$1" ) shift done - "$(dirname $0)/${m%/*}.build" "${m#*/}" "${with_modules[@]}" "--release=${to_release}" + "$(dirname $0)/${m%/*}.build" "${m#*/}" "${with_modules[@]}" "--release=${release}" } -from_release='' -to_release='' +declare usecmd="${PSI_PREFIX}/${PSI_CONFIG_DIR}/init/extensions/use.bash" +declare searchcmd="${PSI_PREFIX}/${PSI_CONFIG_DIR}/init/extensions/search.bash" + +# :FIXME: this does not work ... +#eval "${usecmd} deprecated" +#eval "${usecmd} unstable" + +release='' with_modules=() modules=() while (( $# > 0 )); do case $1 in - --from-release=* ) - from_release=${1/--from-release=} - ;; - --to-release=* ) - to_release=${1/--to-release=} + --release=* ) + release=${1/--release=} ;; --with=*/* ) with_modules+=( ${1} ) @@ -43,9 +46,9 @@ while (( $# > 0 )); do shift done -[[ -z ${from_release} ]] && die 1 "--from-release missing" -[[ -z ${to_release} ]] && die 1 "--to-release missing" +#[[ -z ${from_release} ]] && die 1 "--from-release missing" +[[ -z ${release} ]] && die 1 "--release missing" while read -a tokens ; do echo "${tokens[@]}" change_release "${tokens[@]}" -done < <(module search "${modules[@]}" --no-header --release="${from_release}" "${with_modules[@]}" 2>&1) +done < <("${searchcmd}" "${modules[@]}" --no-header -a "${with_modules[@]}" 2>&1)