iankelling.org
/
git
/
small-misc-bash
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8b83321
)
fix bad assumption about total lines
author
Ian Kelling
<ian@iankelling.org>
Sun, 1 Jun 2014 07:28:39 +0000
(
00:28
-0700)
committer
Ian Kelling
<ian@iankelling.org>
Fri, 9 Sep 2016 21:06:16 +0000
(14:06 -0700)
ll-function
patch
|
blob
|
history
diff --git
a/ll-function
b/ll-function
index cdc2c811409513398c12abb83a5e43f75804b723..4c8b3e8e7a554d554decdee8806c51f45d59bdb8 100644
(file)
--- a/
ll-function
+++ b/
ll-function
@@
-23,11
+23,10
@@
# remove first line size summary
ll() {
local x y perm line binls sizePadding middle tail size \
# remove first line size summary
ll() {
local x y perm line binls sizePadding middle tail size \
-
max_hl_digits hardlinks initial_space hardlink_spacing
+ max_hl_digits hardlinks initial_space hardlink_spacing
local max_hl_digits=0
local -a lines hl
binls=$(type -P ls)
local max_hl_digits=0
local -a lines hl
binls=$(type -P ls)
- local first=true
local aclchar=false
# there's no way to tell if ls uses the acl specifier unless we loop over the data twice
# the 11th char is either
local aclchar=false
# there's no way to tell if ls uses the acl specifier unless we loop over the data twice
# the 11th char is either
@@
-37,11
+36,9
@@
ll() {
# I don't want to see this generally.
while read line; do
# if we did want the first line, it would need to be stripped of non-printing chars:
# I don't want to see this generally.
while read line; do
# if we did want the first line, it would need to be stripped of non-printing chars:
- # line=${line#$'\E[00m'}
- # when no argument is given to ls, the first line is like "total 123M". strip that
- if $first && [[ ! $@ ]]; then
- first=false
- else
+ #line=${line#$'\E[00m'}
+ # lines like "total 123M", we don't want
+ if [[ ! $line =~ ^total\ [0-9][^\ ]*$ ]]; then
lines+=("$line")
[[ ! ${line:10:1} == " " ]] && aclchar=true
lines+=("$line")
[[ ! ${line:10:1} == " " ]] && aclchar=true