From 2aa10ef23accdcf96a88af996eb6436a45f4013c Mon Sep 17 00:00:00 2001 From: levasseur Date: Mon, 20 Sep 2021 16:14:18 +0200 Subject: [PATCH] introduced new var in module for future dependency system --- modules/conf_disks.sh | 1 + modules/conf_mail.sh | 1 + modules/conf_ntp.sh | 1 + modules/conf_ssh.sh | 1 + modules/create_vm.sh | 1 + modules/install_chromium.sh | 1 + modules/install_desktop.sh | 1 + modules/install_mkagent.sh | 1 + modules/install_pkg.sh | 7 ++++--- modules/install_profile.sh | 1 + modules/patch_snmp.sh | 1 + 11 files changed, 14 insertions(+), 3 deletions(-) diff --git a/modules/conf_disks.sh b/modules/conf_disks.sh index cd9a557..2f0fae3 100644 --- a/modules/conf_disks.sh +++ b/modules/conf_disks.sh @@ -17,6 +17,7 @@ # ------------------------------------------------------------------------------ export VER_conf_disks="0.0.8" +export DEP_conf_disks="upgrade_dist" # ------------------------------------------------------------------------------ # ZFS case diff --git a/modules/conf_mail.sh b/modules/conf_mail.sh index cfe49de..f5b159c 100644 --- a/modules/conf_mail.sh +++ b/modules/conf_mail.sh @@ -13,6 +13,7 @@ # ------------------------------------------------------------------------------ export VER_conf_mail="0.0.3" +export DEP_conf_mail="upgrade_dist" conf_mail() { diff --git a/modules/conf_ntp.sh b/modules/conf_ntp.sh index 0619968..4e848b5 100644 --- a/modules/conf_ntp.sh +++ b/modules/conf_ntp.sh @@ -12,6 +12,7 @@ # ------------------------------------------------------------------------------ export VER_conf_ntp="0.0.6" +export DEP_conf_ntp="upgrade_dist" conf_ntp() { diff --git a/modules/conf_ssh.sh b/modules/conf_ssh.sh index 834caa9..6b92023 100644 --- a/modules/conf_ssh.sh +++ b/modules/conf_ssh.sh @@ -12,6 +12,7 @@ # ------------------------------------------------------------------------------ export VER_conf_ssh="0.0.1" +export DEP_conf_ssh="upgrade_dist" conf_ssh() { diff --git a/modules/create_vm.sh b/modules/create_vm.sh index 51ab1b3..113e140 100644 --- a/modules/create_vm.sh +++ b/modules/create_vm.sh @@ -12,6 +12,7 @@ # ------------------------------------------------------------------------------ export VER_create_vm="0.0.1" +export DEP_create_vm="upgrade_dist install_pkg" create_vm() { diff --git a/modules/install_chromium.sh b/modules/install_chromium.sh index fa034ce..0060529 100644 --- a/modules/install_chromium.sh +++ b/modules/install_chromium.sh @@ -14,6 +14,7 @@ # ------------------------------------------------------------------------------ export VER_install_chromium="0.0.1" +export DEP_install_chromium="upgrade_dist" install_chromium() { diff --git a/modules/install_desktop.sh b/modules/install_desktop.sh index 5846ad5..082c784 100644 --- a/modules/install_desktop.sh +++ b/modules/install_desktop.sh @@ -16,6 +16,7 @@ # ------------------------------------------------------------------------------ export VER_install_desktop="0.0.2" +export DEP_install_desktop="upgrade_dist" install_desktop() { diff --git a/modules/install_mkagent.sh b/modules/install_mkagent.sh index c8e51ce..134c315 100644 --- a/modules/install_mkagent.sh +++ b/modules/install_mkagent.sh @@ -13,6 +13,7 @@ # ------------------------------------------------------------------------------ export VER_install_mkagent="0.0.2" +export DEP_install_mkagent="upgrade_dist install_pkg" install_mkagent() { diff --git a/modules/install_pkg.sh b/modules/install_pkg.sh index c2e78b9..160e90a 100644 --- a/modules/install_pkg.sh +++ b/modules/install_pkg.sh @@ -14,6 +14,7 @@ # ------------------------------------------------------------------------------ export VER_install_pkg="0.1.1" +export DEP_install_pkg="upgrade_dist" install_pkg() { @@ -41,7 +42,7 @@ install_pkg() prnt I "Installation de la sélection de paquets..." pkginst $PKGSEL fi - + # Cleaning prnt I "Suppression des paquets résiduels le cas échéant..." pkgautorem @@ -54,11 +55,11 @@ precheck_install_pkg() else prnt I "$(echo $PKGS_RMLIST | wc -w) paquets à supprimer." fi - + if [[ -z PKGS_BLACKLIST ]]; then prnt W "Les paquets $pkg seront placés en liste noire !" fi - + if [[ -z $PKGSEL ]]; then prnt W "Pas de paquet additionel à installer !" else diff --git a/modules/install_profile.sh b/modules/install_profile.sh index 99d0b64..fa7c157 100644 --- a/modules/install_profile.sh +++ b/modules/install_profile.sh @@ -9,6 +9,7 @@ # ------------------------------------------------------------------------------ export VER_install_profile="0.0.2" +export DEP_install_profile="install_pkg" install_profile() { diff --git a/modules/patch_snmp.sh b/modules/patch_snmp.sh index c6c4f2a..75caf00 100644 --- a/modules/patch_snmp.sh +++ b/modules/patch_snmp.sh @@ -9,6 +9,7 @@ # ------------------------------------------------------------------------------ export VER_patch_snmp="0.0.1" +export DEP_patch_snmp="install_pkg" patch_snmp() {