better deb extraction

[small-misc-bash] / ll-function

diff --git a/ll-function b/ll-function
index 862b7623bc94252b785503dce541efd0bd822c40..6deb916139e8988c80ef136ace26f2b2f23447b5 100644 (file)
--- a/ll-function
+++ b/ll-function
@@ -14,14 +14,24 @@
 # 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
-# remove first line size summary
 ll() {
+    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
+
+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
@@ -34,7 +44,7 @@ ll() {
     #  + for any other kind of acl
     #  or blank for no other kind of acl
     #  I don't want to see this generally.
-    while read line; do
+    while read -r line; do
         # 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
@@ -56,12 +66,8 @@ ll() {
                 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=
+                hardlinks=$(( hardlinks - 1 ))
+                [[ $hardlinks == 0 ]] && hardlinks=
                 if (( ${#hardlinks} > max_hl_digits )); then
                     max_hl_digits=${#hardlinks}
                 fi
@@ -72,40 +78,40 @@ ll() {
 %m-%d %I:%M %P" "$@" )
 
     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
+        if [[ $line != [-a-zA-Z][-r][-w][-xsS][-r][-w][-xsS][-r][-w][-xtT]* ]]; then
+            # line we don't understand
            printf "%s\n" "$line"
-       else
-           perm=0
-           for (( x=0; x<=8; x++ )); do
-               y=${line:$(( -1*x + 9 )):1}
-               [[ $y == [tT] ]] && perm=$(( perm + 512 ))
-               if [[ $y == [sS] ]]; then
-                   [[ $x == 3 ]] && perm=$(( perm + 1024 ))
-                   [[ $x == 6 ]] && perm=$(( perm + 2048 ))
-               fi
-               [[ $y != [-ST] ]] && perm=$(( perm + 2**x ))
-           done
-            if $aclchar; then
-               y="${line:11}"
-            else
-                y="${line:10}"
-            fi
-           middle=${y#*[^ ]* }
-           size=${middle#*[^ ]* *[^ ]* }
-           middle=${middle%"$size"}
-           tail=${size#*[^ ]* }
-           size=${size%"$tail"}
-           declare -i sizePadding="${#size} - 1"
-           size=( $size ) # remove spaces
-           size=${size/.?/}
-            
-           printf "%s%4o%${hardlink_spacing}s%s%${sizePadding}s%s\n" \
-                  "${line:0:1}" $perm "$hardlinks" " $middle" "$size" " $tail"
+            continue
        fi
+       perm=0
+       for (( x=0; x<=8; x++ )); do
+           y=${line:$(( -1*x + 9 )):1}
+           [[ $y == [tT] ]] && perm=$(( perm + 512 ))
+           if [[ $y == [sS] ]]; then
+               [[ $x == 3 ]] && perm=$(( perm + 1024 ))
+               [[ $x == 6 ]] && perm=$(( perm + 2048 ))
+           fi
+           [[ $y != [-ST] ]] && perm=$(( perm + 2**x ))
+       done
+        if $aclchar; then
+           y="${line:11}"
+        else
+            y="${line:10}"
+        fi
+       middle=${y#*[^ ]* }
+       size=${middle#*[^ ]* *[^ ]* }
+       middle=${middle%"$size"}
+       tail=${size#*[^ ]* }
+       size=${size%"$tail"}
+       declare -i sizePadding="${#size} - 1"
+       size=( $size ) # remove spaces
+       size=${size/.?/}
+
+       printf "%s%4o%${hardlink_spacing}s%s%${sizePadding}s%s\n" \
+              "${line:0:1}" $perm "$hardlinks" " $middle" "$size" " $tail"
     done
 }
-