From 3a7746805d13a4092aa36caea175daccedf94cd4 Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Fri, 15 Jul 2022 18:21:55 +0200
Subject: [PATCH] modbuild: cleanup

---
 Pmodules/modbuild.in | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/Pmodules/modbuild.in b/Pmodules/modbuild.in
index 7f92148..c7597b4 100755
--- a/Pmodules/modbuild.in
+++ b/Pmodules/modbuild.in
@@ -50,21 +50,12 @@ fi
 PATH='/usr/bin:/bin:/usr/sbin:/sbin'
 
 ##############################################################################
-# save arguments, required for building dependencies
-declare -r	ARGS="$@"
-declare         PMODULES_DISTFILESDIR=''
-declare         PMODULES_TMPDIR=''
-declare		pm_root="${PMODULES_HOME%%/Tools*}"
-declare		ol_mod_root=''
-declare		ol_inst_root=''
-
 source "${mydir}/../lib/libpbuild.bash"    || \
         std::die 3 "Oops: cannot source library -- '$_'"
 source "${mydir}/../lib/libpmodules.bash"  || \
         std::die 3 "Oops: cannot source library -- '$_'"
 
 ##############################################################################
-# set some shell options
 set   -o	nounset
 shopt -s	nocaseglob
 shopt -s	extglob
@@ -168,6 +159,11 @@ MISCELLANEOUS OPTIONS:
 # then configuration file
 # last default
 
+# save arguments, required for building dependencies
+declare -r	ARGS="$@"
+declare         PMODULES_DISTFILESDIR=''
+declare         PMODULES_TMPDIR=''
+
 # versions to be build, '.*' or none means all
 declare -a      versions=()
 declare         opt_build_target='all'
@@ -185,8 +181,6 @@ declare -a      opt_with_modules=()
 
 declare		BUILD_SCRIPT=''
 
-declare         opt_ol_name_or_dir=''
-
 parse_args() {
 	while (( $# > 0 )); do
 		case $1 in
@@ -429,8 +423,8 @@ build_modules_legacy() {
         fi
 	declare ol_name='base'
 	declare ol_type='n'
-	declare ol_mod_root="${pm_root}"
-	declare ol_inst_root="${pm_root}"
+	declare ol_mod_root="${PMODULES_HOME%%/Tools*}"
+	declare ol_inst_root="${PMODULES_HOME%%/Tools*}"
         local -i i=0
         local -i num_variants=${#variants[@]}
         for ((i = 0; i < num_variants; i++)); do
@@ -646,7 +640,7 @@ pm::read_config
 #         or
 #         ${overlay}/var/distfiles
 #         ?
-: ${PMODULES_DISTFILESDIR:=${pm_root}/var/distfiles}
+: ${PMODULES_DISTFILESDIR:="${PMODULES_HOME%%/Tools*}/var/distfiles"}
 : ${PMODULES_TMPDIR:=/var/tmp/${USER}}
 
 declare -r BUILD_SCRIPT