From a4bafe03f5f81226ecc1476c7a902aafcd012181 Mon Sep 17 00:00:00 2001 From: levasseur Date: Wed, 8 Sep 2021 17:08:15 +0200 Subject: [PATCH] few fix and typoes --- lib/filefct.sh | 7 ++++++- lib/zzz_main_fct.sh | 9 +++++++-- modules/conf_locale.sh | 8 ++++---- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/lib/filefct.sh b/lib/filefct.sh index 22600e8..9fcc108 100644 --- a/lib/filefct.sh +++ b/lib/filefct.sh @@ -72,7 +72,11 @@ installfile() filelist="$filelist $arg" fi done - for i in $filelist; do :; done + + # Empty for just to obtain the target which is the last element of the list + for i in $filelist; do + : + done if [[ ! $i == /* ]]; then prnt E "installfile(): Target must be on the root filesystem and fuul path must be provided." die 13 @@ -84,6 +88,7 @@ installfile() prnt E "installfile(): Can't create target dirrectory!" die 12 fi + fi prnt I "Copie des fichiers ${filelist}..." cp -av $filelist if [[ $? -ne 0 ]]; then diff --git a/lib/zzz_main_fct.sh b/lib/zzz_main_fct.sh index 56e45e2..410f0da 100644 --- a/lib/zzz_main_fct.sh +++ b/lib/zzz_main_fct.sh @@ -14,6 +14,12 @@ # errors with immediate exit. read_commandline() { + syntax_error() + { + prnt E "Erreur d'analyse de la ligne de commande, vérifiez vos paramètres." + die 1 + } + # Processing command line options local want_module=false local want_logfile=false @@ -99,8 +105,7 @@ read_commandline() # If those var are true at that point, something is wrong if [[ $want_logfile == true ]] || [[ $want_module == true ]]; then - prnt E "Erreur de syntaxe dans la ligne de commande." - die 1 + syntax_error fi } export -f read_commandline diff --git a/modules/conf_locale.sh b/modules/conf_locale.sh index 71b0b3e..5d99873 100644 --- a/modules/conf_locale.sh +++ b/modules/conf_locale.sh @@ -20,20 +20,20 @@ # Character table (ISO or UTF) # ------------------------------------------------------------------------------ -export VER_conf_locale^="0.1.0" +export VER_conf_locale="0.1.0" conf_locale() { local gen_fname=/etc/locale.gen backupdist $gen_fname - + # Adding locales not yet enabled for loc in $LOCALESET; do prnt I "Activation de la locale ${loc}..." sed -i "/^# $loc /s/^# //" $gen_fname done unset loc - + # Removing locales not in the list while IFS= read -r line; do if [[ ! $(echo $LOCALESET | grep $line) ]]; then @@ -41,7 +41,7 @@ conf_locale() fi done unset $gen_fname - + prnt I "Régénération du cache de locale..." locale-gen