minor bug fix

diff --git a/ll-function b/ll-function
index f2ccb1c004cbddee625c97cd40ebc42a71e7399a..7a1c62378fb0dd7d592e5f7282b51da8419c6dac 100644 (file)
--- a/ll-function
+++ b/ll-function
@@ -21,8 +21,10 @@
 # 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
+    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
@@ -40,10 +42,33 @@ ll() {
            # line=${line#$'\E[00m'}
             lines+=("$line")
             [[ ! ${line:10:1} == " " ]] && aclchar=true
+
+            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
+           if [[ ${line:0:1} == d ]]; then
+                hardlinks=$(( hardlinks - 2 ))
+            else
+                hardlinks=$(( hardlinks - 1 ))
+            fi
+           [[ $hardlinks == 0 ]] && hardlinks=
+            if (( ${#hardlinks} > max_hl_digits )); then
+                max_hl_digits=${#hardlinks}
+            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 +87,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,15 +95,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
 }