firewall.table detect dev windowmanager samba

lib/functions.sh

@@ -112,14 +112,26 @@ function prepare_nftables() {
     fi
 
     current_target="${TARGET:-not_defined_yet}"
+    desktop=false
+    samba=false
     if [[ $current_target == not_defined_yet ]]; then
         echo -n "generating new firewall table first time... "
     else
-        echo -n "generating new firewall table according to target=<${current_target}>... "
+        if [[ $current_target == 'dev' ]]; then
+            if exist_command 'xprop'; then
+                desktop=true
+            fi
+            if exist_command 'smbstatus'; then
+                samba=true
+            fi
+            echo -n "generating new firewall table according to target=<${current_target}>, desktop=<$desktop>, samba=<$samba> ..."
+        else
+            echo -n "generating new firewall table according to target=<${current_target}>..."
+        fi
     fi
-    sudo env target="$current_target" tera -e --env-only --env-key env -t "$MIAOU_BASEDIR/templates/nftables/firewall.table.j2" -o /etc/nftables.rules.d/firewall.table &>/dev/null
+    sudo env target="$current_target" desktop="$desktop" samba="$samba" tera -e --env-only --env-key env -t "$MIAOU_BASEDIR/templates/nftables/firewall.table.j2" -o /etc/nftables.rules.d/firewall.table &>/dev/null
     sudo systemctl reload nftables
-    echo "OK"
+    PREFIX="" echoinfo "DONE"
 
 }
 
@@ -196,7 +208,7 @@ function trap_error() {
 # test all commands exist, else fail
 function exist_command() {
     for i in "$@"; do
-        command -v "$i" &>/dev/null || return 50
+        command -v "$i" >/dev/null || return 50
     done
 }