fix bad assumption about total lines

[small-misc-bash] / ll-function

diff --git a/ll-function b/ll-function
index 7a1c62378fb0dd7d592e5f7282b51da8419c6dac..4c8b3e8e7a554d554decdee8806c51f45d59bdb8 100644 (file)
--- a/ll-function
+++ b/ll-function
@@ -20,13 +20,13 @@
 # better hard link count: number of subdirectories or number of linked files or omitted if 0
 # better human readable size
 # more natural date/time format for my American raised eyes
+# remove first line size summary
 ll() {
     local x y perm line binls sizePadding middle tail size \
-           max_hl_digits hardlinks initial_space hardlink_spacing
+          max_hl_digits hardlinks initial_space hardlink_spacing
     local max_hl_digits=0
     local -a lines hl
     binls=$(type -P ls)
-    local first=true
     local aclchar=false
     # there's no way to tell if ls uses the acl specifier unless we loop over the data twice
     # the 11th char is either
@@ -35,14 +35,19 @@ ll() {
     #  or blank for no other kind of acl
     #  I don't want to see this generally.
     while read line; do
-       if $first; then
-           first=false
-        else
-            # if we did want the first line, it would need to be stripped of non-printing chars:
-           # line=${line#$'\E[00m'}
+        # if we did want the first line, it would need to be stripped of non-printing chars:
+       #line=${line#$'\E[00m'}
+        # lines like "total 123M", we don't want
+       if [[ ! $line =~ ^total\ [0-9][^\ ]*$ ]]; then
             lines+=("$line")
             [[ ! ${line:10:1} == " " ]] && aclchar=true
 
+            # we also need to parse the hardlinks on the first pass, because for
+            # example ls could see the highest count as 11, and thus use 3
+            # places for hardlinks, " 10", but then we use 9 or 8 for a more
+            # useful count, and would then use 2 places. So we have to look
+            # through them all because we can't rely on the spacing that ls
+            # decided on.
             y="${line:11}"
             initial_space="${y%%[![:space:]]*}"
             hardlinks="${y#$initial_space}" # remove any initial spaces
@@ -58,7 +63,7 @@ ll() {
                 max_hl_digits=${#hardlinks}
             fi
             
-            hl+=($hardlinks)
+            hl+=("$hardlinks")
             
         fi
     done< <( "$binls" -lAh --color=always "--time-style=+%m-%d     %Y