Merge pull request #180 from stwa/patch-4

[etc/awesome.git] / scripts / dfs

diff --git a/scripts/dfs b/scripts/dfs
index d78d2bbc21f5ad7a1339986e87bb4662e6980bbc..bc27b816a552fffcc17ff4b716dd2bdf2f129037 100755 (executable)
--- a/scripts/dfs
+++ b/scripts/dfs
@@ -107,7 +107,7 @@ fi
 #   Computing mount point max length
 # -------------------------------------------------------------------------
 MOUNT_POINT_MAX_LENGTH=` \
 #   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;
                                                                                         '
                                                                                         BEGIN       {
                                                                                                 mount_point_length_max = 15;


@@ -212,7 +212,7 @@ echo "$SORTED_FILE_SYSTEMS_INFO" | $AWK_COMMAND -v DEBUG=$DEBUG -v PATTERN=$PATT
                                                         printf ("\n%s", narrow_margin);
                                                 else
                                                         printf ("%-*s", LEFT_COLUMN + 2, "");
                                                         printf ("\n%s", narrow_margin);
                                                 else
                                                         printf ("%-*s", LEFT_COLUMN + 2, "");

-                                        print "                                                     Used    Free     Total ";
+                                        print "                                                    Used     Free       Total ";

                                         if (! NARROW_MODE)
                                                 print "";
                                 }
                                         if (! NARROW_MODE)
                                                 print "";
                                 }


@@ -352,7 +352,7 @@ $0 ~ PATTERN    {
 #           printf ("stars_number = %d\n", stars_number);
 
                        printf ("|");
 #           printf ("stars_number = %d\n", stars_number);
 
                        printf ("|");

-                       for (i = 1; i <= stars_number; i++)
+                       for (i = 1; i <= stars_number && i <= 49; i++)

                        {
                                printf ("%s", "*");
                        }
                        {
                                printf ("%s", "*");
                        }


@@ -364,22 +364,22 @@ $0 ~ PATTERN    {
 
                        if (total_size > 1 * t_bytes)
                                printf ( \
 
                        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 ( \
                                                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 ( \
                                                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 ( \
                                                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 \
                                                );
                }
                                                percentage_occupied, free_size / k_bytes, total_size / k_bytes \
                                                );
                }