X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=indexmeta.sh;h=37a617aa0fa6c860f44ceeb1f568568380d0ee89;hb=71ab2a7fb405c5b0394509ac81acfe35fe2c5ffb;hp=4545df93118bff9869839b0d9dbebcee3011c19e;hpb=e141ec4a5b7d0ec0da9fd9e3860bd003ad2d758e;p=serve0 diff --git a/indexmeta.sh b/indexmeta.sh index 4545df9..37a617a 100644 --- a/indexmeta.sh +++ b/indexmeta.sh @@ -69,7 +69,7 @@ meta_info(){ if [ -d "${meta%/meta}" ]; then grep -aF " $(meta_name "$file")" "$meta" \ - | grep -m1 -xE '[0-9]+ [0-9]+ [0-9]+ tags=[^ ]* comment=[^ ]* .+' \ + | grep -m1 -axE '[0-9]+ [0-9]+ [0-9]+ tags=[^ ]* comment=[^ ]* .+' \ || meta_file "$file" else printf '0\t0\t0\ttags=\tcomment=\t\r' @@ -84,22 +84,23 @@ 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" \ - | while v="$(line)"; do + | grep -aE "$file_pattern" \ + | while read -r v; do meta_line "$v" done >"$meta" RELEASE "$meta" elif [ -d "$dir/.index" -a "$dir" -nt "$meta" ] && LOCK "$meta"; then - touch "$meta" + cp -p "$meta" "$meta.ref"; touch "$meta" find "$dir" -type f -mindepth 1 -maxdepth 1 \ - | grep -E "$file_pattern" \ - | while v="$(line)"; do - if [ "$v" -nt "$meta" ]; then + | grep -aE "$file_pattern" \ + | while read -r v; do + if [ "$v" -nt "$meta.ref" ]; then grep -qF " $(meta_name "$v")" "$meta" \ || meta_line "$v" fi done >>"$meta" + rm "$meta.ref" RELEASE "$meta" fi