From: Paul Hänsch Date: Wed, 18 Jul 2018 07:00:39 +0000 (+0200) Subject: Merge branch 'cgilite' of git.plutz.net:serve0 into cgilite X-Git-Url: http://git.plutz.net/?p=serve0;a=commitdiff_plain;h=f34cc723fb9a552d65e40b6f4846160599eaa8b5 Merge branch 'cgilite' of git.plutz.net:serve0 into cgilite --- f34cc723fb9a552d65e40b6f4846160599eaa8b5 diff --cc indexmeta.sh index 371c51f,2ac459f..45a3bac --- a/indexmeta.sh +++ b/indexmeta.sh @@@ -84,8 -84,8 +84,8 @@@ meta_dir() if [ -d "$dir/.index" -a \! -f "$meta" ] && LOCK "$meta"; then touch "$meta" # preliminary touch to prevent concurrent generators find "$dir" -type f -mindepth 1 -maxdepth 1 \ - | grep -E "$file_pattern" \ + | grep -aE "$file_pattern" \ - | while v="$(line)"; do + | while read -r v; do meta_line "$v" done >"$meta" @@@ -93,8 -93,8 +93,8 @@@ elif [ -d "$dir/.index" -a "$dir" -nt "$meta" ] && LOCK "$meta"; then touch "$meta" find "$dir" -type f -mindepth 1 -maxdepth 1 \ - | grep -E "$file_pattern" \ + | grep -aE "$file_pattern" \ - | while v="$(line)"; do + | while read -r v; do if [ "$v" -nt "$meta" ]; then grep -qF " $(meta_name "$v")" "$meta" \ || meta_line "$v"