good working version of acp

[small-misc-bash] / ll-function

diff --git a/ll-function b/ll-function
index 862b7623bc94252b785503dce541efd0bd822c40..415202fcc85362bf560435f0c8fc1f6508c29a33 100644 (file)
--- a/ll-function
+++ b/ll-function
@@ -14,14 +14,26 @@
 # 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
+
+/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
@@ -56,12 +68,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,7 +80,7 @@ ll() {
 %m-%d %I:%M %P" "$@" )
 
     hardlink_spacing=$((max_hl_digits + 1))
-    
+
     for index in "${!lines[@]}"; do
         line=${lines[index]}
         hardlinks=${hl[index]}
@@ -102,10 +110,9 @@ ll() {
            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"
        fi
     done
 }
-