diff --git a/lib/aaa_errors.sh b/lib/aaa_errors.sh index 13d156e..8813227 100644 --- a/lib/aaa_errors.sh +++ b/lib/aaa_errors.sh @@ -17,7 +17,7 @@ function die() # Don't trigger the ERR signal as we already managed the error trap - ERR - + if [[ "$KEEPGOING" != "true" ]] || [[ "$2" == "--force" ]]; then prnt E "Sortie prématuré avec erreur (code #$errorcode)." # We remove KEEPGOING in case of --force so error() behave correctly @@ -27,7 +27,7 @@ function die() prnt W "On continue malgrés l'erreur #$errorcode." fi unset errorcode - + # Put the trigger back (only executed with --keepgoing) trap "error ${LINENO}" ERR } @@ -52,10 +52,10 @@ function error() local parent_lineno="$1" local message="$2" local code="${3:-1}" - + # Print error header prnt E "${BIWhite}*** ${BIRed}Une erreur fatale est intervenue, le script va s'arrêter immédiatement !$DEFAULTCOL" - + if [[ -n "$message" ]]; then prnt E "Erreur ligne $parent_lineno, code d'erreur $code avec le message :" echo -e "\t\t$message" @@ -87,7 +87,7 @@ function backtrace { echo "======== Pile d'appel ========" typeset -i i=0 - + local func= for func in "${FUNCNAME[@]}"; do if [[ $i -ne 0 ]]; then diff --git a/lib/support.sh b/lib/support.sh index 1453596..acd1599 100644 --- a/lib/support.sh +++ b/lib/support.sh @@ -76,7 +76,7 @@ show_version() echo -e "${BWhite}init.sh${DEFAULTCOL} version ${BGreen}$VERSION${DEFAULTCOL}" echo "" echo "Modules disponibles :" - + local mod= for mod in $MYPATH/modules/*.sh; do # Ran in a subshell to not pollute environment @@ -91,7 +91,7 @@ show_version() ) done unset mod - + if [[ $(id -u) -ne 0 ]]; then echo -e "\n${BYellow}Attention :$DEFAULTCOL Ce script requiert les droits d'administration pour fonctionner." fi diff --git a/lib/version.sh b/lib/version.sh index 6b387b7..5319629 100644 --- a/lib/version.sh +++ b/lib/version.sh @@ -53,7 +53,7 @@ set_sys_vars() prnt E "get_os_version(): incorect number of parameters ($@)." die --force 7 fi - + export SYS_ARCH=$1 export SYS_DIST=$2 export SYS_VER=$3 diff --git a/lib/zzz_main_fct.sh b/lib/zzz_main_fct.sh index 11200e4..0b23f75 100644 --- a/lib/zzz_main_fct.sh +++ b/lib/zzz_main_fct.sh @@ -19,12 +19,12 @@ read_commandline() prnt E "Erreur d'analyse de la ligne de commande, vérifiez vos paramètres." die 1 --force } - + # Processing command line options local want_module=false local want_logfile=false local want_conffile=false - + local opt= for opt in $@; do case $opt in diff --git a/modules/conf_disks.sh b/modules/conf_disks.sh index 5940ae5..6d11cae 100644 --- a/modules/conf_disks.sh +++ b/modules/conf_disks.sh @@ -24,7 +24,7 @@ export DEP_conf_disks="upgrade_dist" conf_zfs() { prnt I "Création du volume calcul en ZFS." - + # Create destination directory mkdir -pv $CALCMOUNTPOINT @@ -53,7 +53,7 @@ conf_zfs() partprobe done fi - + if [[ $(zpool create zcalc -m $CALCMOUNTPOINT $CALCLEVEL $opt $CALCDRV) ]]; then # We activate lz4 compression by default zpool set zcalc compression=lz4 @@ -98,7 +98,7 @@ conf_xfs() conf_disks() { [[ -n $STOP_CONF_DISK ]] && return 0 - + if [[ ! $CALCDRV ]]; then prnt I "Pas de disque de calcul défini, rien à faire." return 0 @@ -140,9 +140,9 @@ precheck_conf_disks() prnt E "Le disque $drv n'existe pas. Abandon." die 150 fi - (( drvcount+=1 )) + (( drvcount+=1 )) done - + if [[ ! $CALCTYPE=="zfs" && drvcount -gt 1 ]]; then prnt E "Plusieurs diques impossibles avec Ext4 ou XFS !" die 150 diff --git a/modules/conf_mail.sh b/modules/conf_mail.sh index 4f2a2c7..67db85e 100644 --- a/modules/conf_mail.sh +++ b/modules/conf_mail.sh @@ -19,7 +19,7 @@ conf_mail() { prnt I "Installation de postfix..." pkginst postfix - + prnt I "Configuration de postfix..." installfile postfix_main.cf /etc/postfix/main.cf sed -i -e "s/@HOSTNAME@/$HOSTNAME/" -e "s/@MAINDOM@/$MAINDOM/" \ diff --git a/modules/conf_ssh.sh b/modules/conf_ssh.sh index cecc3a7..904a5f2 100644 --- a/modules/conf_ssh.sh +++ b/modules/conf_ssh.sh @@ -21,7 +21,7 @@ conf_ssh() prnt I "Arrêt du service SSH..." svc_stop ssh - + prnt I "Installation des fichiers de configuration de SSH..." for f in /etc/ssh/ssh{,d}_config; do backupdist $f diff --git a/modules/create_vm.sh b/modules/create_vm.sh index 2780c0c..5e5d53f 100644 --- a/modules/create_vm.sh +++ b/modules/create_vm.sh @@ -20,7 +20,7 @@ create_vm() prnt I "Cette machine n'est pas configurée pour la virtualisation, rien à faire." return 0 fi - + pkginst virtualbox # Create welcoming dirs diff --git a/modules/install_chromium.sh b/modules/install_chromium.sh index 065f003..fb014b6 100644 --- a/modules/install_chromium.sh +++ b/modules/install_chromium.sh @@ -21,20 +21,20 @@ install_chromium() # Add Debian Buster repo to sources.list.d directory prnt I "Ajout du dépot Debian Buster aux sources logicielles..." installfile debian_buster.list /etc/apt/sources.list.d/ - + # Install Debian GPG keys apt-key adv --keyserver keyserver.ubuntu.com --recv-keys DCC9EFBF77E11517 apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138 apt-key adv --keyserver keyserver.ubuntu.com --recv-keys AA8E81B4331F7F50 apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 112695A0E562B32A - + # Install package manager conf file for Chromium installfile apt_chromium.conf /etc/apt/preferences.d/ - + # Update package list and install prnt I "Mise à jour de la liste des dépots..." pkgupt - + prnt I "Installation de Chromium..." pkginst chromium } diff --git a/modules/install_profile.sh b/modules/install_profile.sh index 8609e17..4f70a33 100644 --- a/modules/install_profile.sh +++ b/modules/install_profile.sh @@ -14,12 +14,12 @@ export DEP_install_profile="install_pkg" install_profile() { #installfile ansi_shadow.flf /usr/share/figlet/ansi_shadow.flf - + local usrlist="/root" if find /home -mindepth 1 -maxdepth 1 -type d | read; then usrlist="$usrlist /home/*" fi - + # Create a dir in home so /home/* is always interpreted correctly for usr in $usrlist; do backupdist $usr/{,.}profile $usr/.bashrc diff --git a/modules/upgrade_dist.sh b/modules/upgrade_dist.sh index 41cf5cf..199634d 100644 --- a/modules/upgrade_dist.sh +++ b/modules/upgrade_dist.sh @@ -22,7 +22,7 @@ export DEP_upgrade_dist="conf_ntp" upgrade_dist() { local proxyfile=/etc/apt/apt.conf.d/00proxy - + # We backup entire apt dir as future version will normalise source.list files backupdist /etc/apt @@ -42,16 +42,16 @@ upgrade_dist() else prnt I "Pas de proxy configuré, ne fait rien." fi - + # Remplace source.list from dist with ours (be smarter) installfile "${SYS_DIST}_${SYS_VER}.list" /etc/apt/sources.list - + prnt I "Mise à jour de la liste des paquets..." pkgupdt - + prnt I "Application des mises à jour de paquets..." pkgupgd - + prnt I "Suppression des paquets résiduels..." pkgautorem } @@ -59,7 +59,7 @@ upgrade_dist() precheck_upgrade_dist() { prnt I "Vérification du réseau..." - + if [[ $(noerror wget -q --tries=10 --timeout=20 --spider http://www.cnrs.fr) != 0 ]]; then prnt E "Réseau non fonctionnel ! Abandon." die 160