From bf5adbadf5ad7e96047d7d2a8b01158605a2966b Mon Sep 17 00:00:00 2001 From: levasseur Date: Fri, 7 Jan 2022 17:40:31 +0100 Subject: [PATCH] main: externalized prepost actions loading --- init.sh | 6 +----- lib/zzz_main_fct.sh | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/init.sh b/init.sh index 6218a3f..e7544c6 100755 --- a/init.sh +++ b/init.sh @@ -122,11 +122,7 @@ load_autoconf load_configuration -# Load pre and post actions for package manager -for prepost in $MYPATH/prepost.d/*.sh; do - . $prepost -done -unset prepost +load_prepost_actions process_commandline_and_vars diff --git a/lib/zzz_main_fct.sh b/lib/zzz_main_fct.sh index 0d4bf71..f77abaa 100644 --- a/lib/zzz_main_fct.sh +++ b/lib/zzz_main_fct.sh @@ -255,6 +255,20 @@ load_configuration() export -f load_configuration +# ------------------------------------------------------------------------------ +# Load pre and post actions for package manager +load_prepost_actions() +{ + local prepost= + for prepost in $MYPATH/prepost.d/*.sh; do + prnt I "Loading prepost actions in $prepost ..." + . $prepost + done + unset prepost +} +export -f load_prepost_actions + + # ------------------------------------------------------------------------------ # Do deeper command line analysis to detect unconsistancies process_commandline_and_vars()