X-Git-Url: https://iankelling.org/git/?p=small-misc-bash;a=blobdiff_plain;f=ll-function;h=415202fcc85362bf560435f0c8fc1f6508c29a33;hp=f2ccb1c004cbddee625c97cd40ebc42a71e7399a;hb=08759aa5b31bdd7a48f0ec161ec4c0b4235098dc;hpb=269733e64ff0b5e39f7882d198c9956b770d60ce

diff --git a/ll-function b/ll-function
index f2ccb1c..415202f 100644
--- a/ll-function
+++ b/ll-function
@@ -14,17 +14,31 @@
 # limitations under the License.
 
 
-# ls -lA with enhanced output
-# octal permissions
-# omited acl type specifier
-# 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
 ll() {
-    local x y z q perm padding line binls sizePadding middle tail size
-    local -a lines
+    case $1 in
+        -h|--help)
+            cat <<'EOF'
+usage: ll [ARGS_TO_LS]
+ls -lA with enhanced output
+
+octal permissions
+omited acl type specifier
+better hard link count: number of subdirectories or the
+    number of linked files or omitted if it is 0
+better human readable size
+more natural date/time format for my American raised eyes
+remove first line size summary
+
+/bin/ls output is below:
+
+EOF
+            ;;
+    esac
+    local x y perm line binls sizePadding middle tail size \
+          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
@@ -33,17 +47,43 @@ 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
+            if ! [[ $line == [-dscbl][-r][-w][-xsS][-r][-w][-xsS][-r][-w][-xtT]* ]]; then
+                hardlinks=
+            else
+                [[ ! ${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
+                hardlinks="${hardlinks%%[[:space:]]*}" # remove everything beyond first word
+                # ignore the hardlinks that files/dirs always have
+                hardlinks=$(( hardlinks - 1 ))
+                [[ $hardlinks == 0 ]] && hardlinks=
+                if (( ${#hardlinks} > max_hl_digits )); then
+                    max_hl_digits=${#hardlinks}
+                fi
+            fi
+            hl+=("$hardlinks")
         fi
     done< <( "$binls" -lAh --color=always "--time-style=+%m-%d     %Y
 %m-%d %I:%M %P" "$@" )
-    for line in "${lines[@]}"; do
+
+    hardlink_spacing=$((max_hl_digits + 1))
+
+    for index in "${!lines[@]}"; do
+        line=${lines[index]}
+        hardlinks=${hl[index]}
 	if ! [[ $line == [-dscbl][-r][-w][-xsS][-r][-w][-xsS][-r][-w][-xtT]* ]]; then
 	    printf "%s\n" "$line"
 	else
@@ -62,10 +102,6 @@ ll() {
             else
                 y="${line:10}"
             fi
-            initial_space="${y%%[![:space:]]*}"
-            hardLinks="${y#$initial_space}" # remove any initial spaces
-            hardLinks="${hardLinks%%[[:space:]]*}" # remove everything beyond first word
-            hardLink_spacing=$(( ${#initial_space} + ${#hardLinks} )) # length of hardlink string including padding
 	    middle=${y#*[^ ]* }
 	    size=${middle#*[^ ]* *[^ ]* }
 	    middle=${middle%"$size"}
@@ -74,16 +110,9 @@ ll() {
 	    declare -i sizePadding="${#size} - 1"
 	    size=( $size ) # remove spaces
 	    size=${size/.?/}
-            # ignore the hardlinks that files/dirs always have
-	    if [[ ${line:0:1} == d ]]; then
-                hardLinks=$(( hardLinks - 2 ))
-            else
-                hardLinks=$(( hardLinks - 1 ))
-            fi
-	    [[ $hardLinks == 0 ]] && hardLinks=
-	    printf "%s%4o%${hardLink_spacing}s%s%${sizePadding}s%s\n" \
-		   "${line:0:1}" $perm "$hardLinks" " $middle" "$size" " $tail"
+
+	    printf "%s%4o%${hardlink_spacing}s%s%${sizePadding}s%s\n" \
+		   "${line:0:1}" $perm "$hardlinks" " $middle" "$size" " $tail"
 	fi
     done
 }
-