iankelling.org
/
git
/
small-misc-bash
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
apache, update docs
[small-misc-bash]
/
ll-function
diff --git
a/ll-function
b/ll-function
index 862b7623bc94252b785503dce541efd0bd822c40..c17ff3d36ef206bdf4ea68deef9646697c070349 100644
(file)
--- a/
ll-function
+++ b/
ll-function
@@
-22,6
+22,15
@@
# more natural date/time format for my American raised eyes
# remove first line size summary
ll() {
# 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
+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 x y perm line binls sizePadding middle tail size \
max_hl_digits hardlinks initial_space hardlink_spacing
local max_hl_digits=0
@@
-56,12
+65,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
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
if (( ${#hardlinks} > max_hl_digits )); then
max_hl_digits=${#hardlinks}
fi
@@
-72,7
+77,7
@@
ll() {
%m-%d %I:%M %P" "$@" )
hardlink_spacing=$((max_hl_digits + 1))
%m-%d %I:%M %P" "$@" )
hardlink_spacing=$((max_hl_digits + 1))
-
+
for index in "${!lines[@]}"; do
line=${lines[index]}
hardlinks=${hl[index]}
for index in "${!lines[@]}"; do
line=${lines[index]}
hardlinks=${hl[index]}
@@
-102,10
+107,9
@@
ll() {
declare -i sizePadding="${#size} - 1"
size=( $size ) # remove spaces
size=${size/.?/}
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
}
printf "%s%4o%${hardlink_spacing}s%s%${sizePadding}s%s\n" \
"${line:0:1}" $perm "$hardlinks" " $middle" "$size" " $tail"
fi
done
}
-