From: Ian Kelling <ian@iankelling.org>
Date: Sun, 1 Jun 2014 07:28:39 +0000 (-0700)
Subject: fix bad assumption about total lines
X-Git-Url: https://iankelling.org/git/?a=commitdiff_plain;h=7a8e8fcfa2772ed85b5ca74a307bf1ecc7782168;p=small-misc-bash

fix bad assumption about total lines
---

diff --git a/ll-function b/ll-function
index cdc2c81..4c8b3e8 100644
--- a/ll-function
+++ b/ll-function
@@ -23,11 +23,10 @@
 # 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
@@ -37,11 +36,9 @@ ll() {
     #  I don't want to see this generally.
     while read line; do
         # if we did want the first line, it would need to be stripped of non-printing chars:
-	# line=${line#$'\E[00m'}
-        # when no argument is given to ls, the first line is like "total 123M". strip that
-	if $first && [[ ! $@ ]]; then
-	    first=false
-        else
+	#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