X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=ll-function;h=c5ff61822252e028fd9a7698aff4958419012ea9;hb=13cbf28d364ed1b7f43fa53e48e74ab62f0c8600;hp=862b7623bc94252b785503dce541efd0bd822c40;hpb=11cb2a607f5cb69fa92e711a19328dcba3579574;p=small-misc-bash diff --git a/ll-function b/ll-function index 862b762..c5ff618 100644 --- a/ll-function +++ b/ll-function @@ -56,12 +56,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 +68,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 +98,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 } -