fixed mount point length calculation and misalignment of 4-digit size numbers

[etc/awesome.git] / scripts / dfs

diff --git a/scripts/dfs b/scripts/dfs
index 1730b6e5e5344d79355673b5ab6fc92beb5f073a..f04b05127597e0d8322b4d35ebafa01795c3c9a1 100755 (executable)
--- a/scripts/dfs
+++ b/scripts/dfs
@@ -6,6 +6,8 @@
 #   Integrated into Lain in september 2013
 #   https://github.com/copycat-killer/lain
 
+#   Requires gawk
+
 # -------------------------------------------------------------------------
 #   Decoding options
 # -------------------------------------------------------------------------
@@ -105,7 +107,7 @@ fi
 #   Computing mount point max length
 # -------------------------------------------------------------------------
 MOUNT_POINT_MAX_LENGTH=` \
-                                                                                        echo $SORTED_FILE_SYSTEMS_INFO | $AWK_COMMAND -v PATTERN=$PATTERN \
+                                                                                        echo "$SORTED_FILE_SYSTEMS_INFO" | $AWK_COMMAND -v PATTERN=$PATTERN \
                                                                                         '
                                                                                         BEGIN       {
                                                                                                 mount_point_length_max = 15;
@@ -183,7 +185,7 @@ echo "$SORTED_FILE_SYSTEMS_INFO" | $AWK_COMMAND -v DEBUG=$DEBUG -v PATTERN=$PATT
                                         current_date = strftime ("%d-%m-%Y @ %H:%M:%S", localtime (systime ()));
                                         free_threshold = 10; # %
 
-                                                printf ("<!-- DEBUT CONTENU -->\n");
+                                printf ("<!-- DEBUT CONTENU -->\n");
 
                                         printf ( \
                                                         "<A NAME=\"top\"></A>\n" \
@@ -197,9 +199,9 @@ echo "$SORTED_FILE_SYSTEMS_INFO" | $AWK_COMMAND -v DEBUG=$DEBUG -v PATTERN=$PATT
                                                         "<TD ALIGN=LEFT><STRONG>Mount point</STRONG></TD>\n" \
                                                         "<TD ALIGN=CENTER><STRONG>%% Usato&nbsp;(<SPAN CLASS=\"titleblue\">*</SPAN>)" \
                                                         "&nbsp;-&nbsp;%% Free&nbsp;(<SPAN CLASS=\"titlegreen\">*</SPAN>)</STRONG></TD>\n" \
-                                                        "<TD ALIGN=CENTER><STRONG>%% Usato</STRONG></TD>\n" \
-                                                        "<TD ALIGN=CENTER><STRONG>Spazio libero</STRONG></TD>\n" \
-                                                        "<TD ALIGN=CENTER><STRONG>Spazio totale</STRONG></TD>\n" \
+                                                        "<TD ALIGN=CENTER><STRONG>%% Used</STRONG></TD>\n" \
+                                                        "<TD ALIGN=CENTER><STRONG>Free</STRONG></TD>\n" \
+                                                        "<TD ALIGN=CENTER><STRONG>Total</STRONG></TD>\n" \
                                                         "</TR>\n" );
                                 }
                                 else
@@ -362,22 +364,22 @@ $0 ~ PATTERN    {
 
                        if (total_size > 1 * t_bytes)
                                printf ( \
-                                               "| %3d%%    %5.1f    %5.1f Tb\n", \
+                                               "| %3d%%   %6.1f   %6.1f Tb\n", \
                                                percentage_occupied, free_size / t_bytes, total_size / t_bytes \
                                                );
                        else if (total_size > 1 * g_bytes)
                                printf ( \
-                                               "| %3d%%    %5.1f    %5.1f Gb\n", \
+                                               "| %3d%%   %6.1f   %6.1f Gb\n", \
                                                percentage_occupied, free_size / g_bytes, total_size / g_bytes \
                                                );
                        else if (total_size > 1 * m_byptes)
                                printf ( \
-                                               "| %3d%%    %5.1f    %5.1f Mb\n", \
+                                               "| %3d%%   %6.1f   %6.1f Mb\n", \
                                                percentage_occupied, free_size / m_bytes, total_size / m_bytes \
                                                );
                        else
                                printf ( \
-                                               "| %3d%%    %5.1f    %5.1f Kb\n", \
+                                               "| %3d%%   %6.1f   %6.1f Kb\n", \
                                                percentage_occupied, free_size / k_bytes, total_size / k_bytes \
                                                );
                }