From 198763c01cd5a6dc79faf9fd614a1b5d74eb0b50 Mon Sep 17 00:00:00 2001
From: levasseur <geoffray.levasseur@obs-mip.fr>
Date: Fri, 18 Feb 2022 18:19:15 +0100
Subject: [PATCH] improved checks display on some modules

---
 modules/conf_network.sh    | 12 ++++++------
 modules/install_desktop.sh | 10 +++++-----
 modules/install_pkg.sh     | 12 +++++++-----
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/modules/conf_network.sh b/modules/conf_network.sh
index b488fee..739d687 100644
--- a/modules/conf_network.sh
+++ b/modules/conf_network.sh
@@ -119,14 +119,14 @@ precheck_conf_network()
                         if [[ -z $(eval echo \$NET4_IP_$iface) ]]; then
                             prnt E "No IPv4 have been assigned to static interface $iface!"
                         fi
-                        prnt I " * Interface $iface will have $(eval echo \$NET4_IP_$iface) static IPv4 address."
+                        prnt m " * Interface $iface will have $(eval echo \$NET4_IP_$iface) static IPv4 address."
                     ;;
                     "dhcp")
-                        prnt I " * Interface $iface will use DHCP."
+                        prnt m " * Interface $iface will use DHCP."
                     ;;
                     "manual")
                         file_must_exists $(eval echo \$NET4_MANUAL_FILE_$iface)
-                        prnt I " * Interface $iface will use manual IPv4 configuration in a file."
+                        prnt m " * Interface $iface will use manual IPv4 configuration in a file."
                     ;;
                     *)
                         prnt E "Interfaces mode \"$(eval echo \$NET4_MODE_$iface)\" unsuported!"
@@ -148,14 +148,14 @@ precheck_conf_network()
                         if [[ -z $(eval echo \$NET6_IP_$iface) ]]; then
                             prnt E "No IPv6 have been assigned to static interface $iface!"
                         fi
-                        prnt I " * Interface $iface will have $(eval echo \$NET6_IP_$iface) static IPv6 address."
+                        prnt m " * Interface $iface will have $(eval echo \$NET6_IP_$iface) static IPv6 address."
                     ;;
                     "dhcp")
-                        prnt I " * Interface $iface will use DHCPv6."
+                        prnt m " * Interface $iface will use DHCPv6."
                     ;;
                     "manual")
                         file_must_exists $(eval echo \$NET6_MANUAL_FILE_$iface)
-                        prnt I " * Interface $iface will use manual IPv6 configuration in a file."
+                        prnt m " * Interface $iface will use manual IPv6 configuration in a file."
                     ;;
                     *)
                         prnt E "Interfaces mode \"$(eval echo \$NET6_MODE_$iface)\" unsuported!"
diff --git a/modules/install_desktop.sh b/modules/install_desktop.sh
index ada5b1e..35347a9 100644
--- a/modules/install_desktop.sh
+++ b/modules/install_desktop.sh
@@ -21,11 +21,11 @@ export DEP_install_desktop="upgrade_dist"
 install_desktop()
 {
     if [[ -n $X11_DRV ]]; then
-        prnt I "Installation de pilotes supplémentaires X11..."
+        prnt I "Installing additionnal X11 drivers..."
         pkginst $X11_DRV
     fi
     if [[ $UBUNTU_FLAVOR ]]; then
-        prnt I "Installation de l'environnement $UBUNTU_FLAVOR..."
+        prnt I "Installing $UBUNTU_FLAVOR environment..."
         pkginst ${UBUNTU_FLAVOR}-desktop
     fi
     set_reboot_needed
@@ -34,12 +34,12 @@ install_desktop()
 precheck_install_desktop()
 {
     if [[ -z $UBUNTU_FLAVOR ]]; then
-        prnt W "Pas de saveur Ubuntu choisie, aucun environnement de bureau ne sera installé !"
+        prnt W "No Ubuntu flavor chosen, no desktop environment will be installed!"
     else
-        prnt m "La saveur $UBUNTU_FLAVOR sera installée..."
+        prnt m " * The flavor $UBUNTU_FLAVOR will be installed..."
     fi
     if [[ -n $X11_DRV ]]; then
-        prnt W "Des pilotes non libres seront installé."
+        prnt W "Non free drivers will be installed."
     fi
 }
 
diff --git a/modules/install_pkg.sh b/modules/install_pkg.sh
index 96d8c83..5c1e99e 100644
--- a/modules/install_pkg.sh
+++ b/modules/install_pkg.sh
@@ -52,20 +52,22 @@ install_pkg()
 precheck_install_pkg()
 {
     if [[ -z PKGS_RMLIST ]]; then
-        prnt I "No package to remove."
+        prnt m " * No package to remove."
     else
-        prnt I "$(echo $PKGS_RMLIST | wc -w) package to remove."
+        prnt m " * $(echo $PKGS_RMLIST | wc -w) package to remove."
     fi
 
     if [[ -z PKGS_BLACKLIST ]]; then
-        prnt W "The packages $pkg will be placed into the blacklist !"
+        prnt m " * The packages $pkg will be placed into the blacklist !"
         file_must_exists pkgman/blacklist.conf
+    else
+        prnt m " * No package to blacklist."
     fi
 
     if [[ -z $PKGSEL ]]; then
-        prnt W "No additionnal package to install !"
+        prnt m " * No additionnal package to install !"
     else
-        prnt I "$(echo $PKGSEL | wc -w) additionnal package have to be installed."
+        prnt m " * $(echo $PKGSEL | wc -w) additionnal package have to be installed."
     fi
 }