=== modified file 'bin/fileset.awk' --- bin/fileset.awk 2014-06-26 14:20:39 +0000 +++ bin/fileset.awk 2014-05-26 09:12:33 +0000 @@ -3,11 +3,6 @@ fname="\"$fname\"" # constants so I don't have to write it out # dirname="\"$dirname\"" or_die="|| exit $?" - - if ("RSFILTER" in ENVIRON) { - # clean the filter file - printf "" >ENVIRON["RSFILTER"] - } } function escaped(str) { === modified file 'bin/fslist' --- bin/fslist 2014-06-26 14:20:39 +0000 +++ bin/fslist 2014-06-20 14:09:59 +0000 @@ -36,9 +36,6 @@ ROOT=${${${ROOT:-$PWD}:a}%/} : ${compact:=1} -: ${print_m:=1} -: ${print_o:=1} -: ${print_c:=1} fnames=( ) for arg in "${@:-$ROOT}"; do @@ -84,31 +81,27 @@ elif [[ $t == l ]]; then statement $'l\t'$s[link] $'\t' elif [[ $t == f ]]; then - if (($print_c)); then - IFS= read -r -d '' content <$fname - flags='' + IFS= read -r -d '' content <$fname + flags='' + if [[ $content == *$'\n' ]]; then + content=${content%$'\n'} if [[ $content == *$'\n' ]]; then - content=${content%$'\n'} - if [[ $content == *$'\n' ]]; then - # force appending newline - flags+=n - fi - else - flags+=N - fi - if ! (($compact)) || [[ $content == *$'\t'* || $content == *$'\n'* ]]; then - statement C$flags$'\t'$content $'\n' - else - statement c$flags$'\t'$content - fi - else - statement f + # force appending newline + flags+=n + fi + else + flags+=N + fi + if ! (($compact)) || [[ $content == *$'\t'* || $content == *$'\n'* ]]; then + statement C$flags$'\t'$content $'\n' + else + statement c$flags$'\t'$content fi else statement $t fi - (($print_o)) && statement o$s[uid]:$s[gid] - (($print_m)) && statement m$fmode + statement o$s[uid]:$s[gid] + statement m$fmode statement_end done === modified file 'bin/fsvimdiff' --- bin/fsvimdiff 2014-06-26 14:20:39 +0000 +++ bin/fsvimdiff 2014-06-20 15:23:19 +0000 @@ -6,10 +6,10 @@ opts='diff scrollbind cursorbind scrollopt+=hor nowrap fdm=diff readonly nomodified buftype=nofile bufhidden=delete' exec vim \ +'0r!ROOT="$ROOT1" fslist' \ - +"setlocal $opts" \ - +"exe 'file '.\$ROOT1.'.fs'" \ + +setlocal\ $opts \ + +"exe 'file '.\$ROOT1.'.fileset'" \ +'rightb vnew' \ +'0r!ROOT="$ROOT2" fslist' \ - +"setlocal $opts" \ - +"exe 'file '.\$ROOT2.'.fs'" \ - +'norm ggzM' + +setlocal\ $opts \ + +"exe 'file '.\$ROOT2.'.fileset'" \ + +norm\ ggzM