Merge pull request #338 from klaernie/master

[etc/awesome.git] / scripts / dfs

diff --git a/scripts/dfs b/scripts/dfs
index f04b05127597e0d8322b4d35ebafa01795c3c9a1..47c7b82020f88ef131cc90962e1b0a2956e2bebe 100755 (executable)
--- a/scripts/dfs
+++ b/scripts/dfs
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash

 #
 #   Adapted from Eridan's "fs" (cleanup, enhancements and switch to bash/Linux)
 #   JM,  10/12/2004
 #
 #   Adapted from Eridan's "fs" (cleanup, enhancements and switch to bash/Linux)
 #   JM,  10/12/2004


@@ -11,10 +11,11 @@
 # -------------------------------------------------------------------------
 #   Decoding options
 # -------------------------------------------------------------------------
 # -------------------------------------------------------------------------
 #   Decoding options
 # -------------------------------------------------------------------------

-USAGE="Usage: $0 [-h(elp)] | [-n(arrow mode)] | [-w(eb output)]"
+USAGE="Usage: $0 [-h(elp)] | [-n(arrow mode)] | [-w(eb output) | --type=<fstype> | --exclude-type=<fstype>]"

 
 NARROW_MODE=0
 WEB_OUTPUT=0
 
 NARROW_MODE=0
 WEB_OUTPUT=0

+DF_OPTIONS=""

 
 while [ $# -gt 0 ]; do
 case "$1" in
 
 while [ $# -gt 0 ]; do
 case "$1" in


@@ -31,6 +32,12 @@ NARROW_MODE=1
 "-w" )
 WEB_OUTPUT=1
 ;;
 "-w" )
 WEB_OUTPUT=1
 ;;

+--type=*)
+DF_OPTIONS+=" $1"
+;;
+--exclude-type=*)
+DF_OPTIONS+=" $1"
+;;

 * )
 echo $USAGE
 exit
 * )
 echo $USAGE
 exit


@@ -58,6 +65,9 @@ AWK_COMMAND="/usr/bin/env gawk"
 ;;
 esac
 
 ;;
 esac
 

+# Add additional df options
+DF_COMMAND+=$DF_OPTIONS
+

 # -------------------------------------------------------------------------
 #   Grabbing "df" result
 # -------------------------------------------------------------------------
 # -------------------------------------------------------------------------
 #   Grabbing "df" result
 # -------------------------------------------------------------------------


@@ -212,9 +222,9 @@ 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)
                                         if (! NARROW_MODE)

-                                                print "";
+                                                print " ";

                                 }
                         }
 
                                 }
                         }
 


@@ -352,7 +362,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", "*");
                        }