Użycie prawidłowego dla immudex pliku immudex-motd2.

diff --git a/immudex-motd2 b/immudex-motd2
index e5a040cbadf378c6109ed02debdbe03784019591..e0f4c6439a73d08aeebf81b5a7500875f8f23f99 100755 (executable)
--- a/immudex-motd2
+++ b/immudex-motd2
@@ -1,8 +1,10 @@
 #!/bin/bash
 
-# Deps: figlet lolcat
-# Deps GH: https://github.com/xero/figlet-fonts -> /usr/share/figlet-fonts;
-
+#/usr/bin/figlet immudex;
+#source /usr/local/bin/library.sh;
+#ascii_colors;
+#echo -en "\e[1m"; echo "immudex" | /usr/bin/figlet | lolcat; echo -en "\e[0m";
+#echo "immudex" | /usr/bin/figlet | lolcat
 echo "X280" | /usr/bin/figlet -f /usr/share/figlet-fonts/3d.flf | lolcat
 echo;
 echo "Today is: $(date)";
@@ -12,16 +14,22 @@ cpuIdle=$(vmstat | tail -1 | awk '{printf $15}');
 cpuUsage=$((100 - $cpuIdle));
 echo -e "  \tCPU: ${cpuUsage}%";
 echo -e "  \tMEM: $(free -h | sed -n '2p' | awk '{printf $7}' | sed 's/i//') Free";
-echo -e "  \tMount points:\tFree/Total\t(Usage%)";
-mountPointsList="/$ /home$";
-for mountPoint in $mountPointsList; do
-  if $(df -h 2>/dev/null | grep -q "${mountPoint}"); then
-    diskSize=$(df -h 2> /dev/null | grep "${mountPoint}" | awk '{printf $2}');
-    diskFree=$(df -h 2> /dev/null | grep "${mountPoint}" | awk '{printf $4}');
-    diskUsage_perc=$(df -h 2> /dev/null | grep "${mountPoint}" | sed 's/%//' | awk '{printf $5}');
-    echo -e "\t$(echo $mountPoint | sed 's,\$,,'):\t\t${diskFree}/${diskSize}\t(${diskUsage_perc}%)";
-  fi
-done
+if $(df -h 2> /dev/null | grep -q '/dev/mapper'); then
+  i=1;
+  echo -e "  \tCRYPT_PARTi: Free/Total (Usage%)";
+  amountOfDisks=$(df -h 2> /dev/null | grep '/dev/mapper' | wc -l | awk '{printf $1}');
+  while [ $i -le $amountOfDisks ]; do
+    diskSize=$(df -h 2> /dev/null | grep '/dev/mapper' | sed -n "${i}p" | awk '{printf $2}');
+    diskFree=$(df -h 2> /dev/null | grep '/dev/mapper' | sed -n "${i}p" | awk '{printf $4}');
+    diskUsage_perc=$(df -h 2> /dev/null | grep '/dev/mapper' | sed -n "${i}p" | sed 's/%//' | awk '{printf $5}');
+  #FCP = First Crypt Partition
+    echo -e "  \tCRYPT_PART${i}: ${diskFree}/${diskSize}   (${diskUsage_perc}%)";
+    i=$((i + 1));
+  done
+else
+  echo -e "  \tCRYPT_PART: N/A";
+fi
+echo -e "  \tIP: $(ip addr show $(sed -n '2p' /proc/net/route | awk '{printf $1}') | grep 'inet\ ' | awk '{printf $2"\n"}')";
 echo -e "  \tPROCESSES: $(ps -aux | wc -l | awk '{printf $1}')";
 if $(uptime | grep -q 'day'); then
   utime=$(uptime | awk '{printf $3" "$4" "$5}' | sed -e 's/\,$//' -e 's,:,h ,');
@@ -34,7 +42,7 @@ else
     echo -e "  \tUPTIME: 0h ${utime}m";
   fi
 fi
-echo -e " \t$(uptime | grep -o "load.*$" | tr [a-z] [A-Z])";
+echo -e " \t$(uptime | grep -o "load.*$" | tr '[a-z]' '[A-Z]')";
 echo;
 echo -e "morketsmerke.org @ 2025 https://github.com/xf0r3m/immudex";
 echo;