]> git.plutz.net Git - serve0/commitdiff
Merge branch 'cgilite' of git.plutz.net:serve0 into cgilite
authorPaul Hänsch <paul@plutz.net>
Wed, 18 Jul 2018 07:00:39 +0000 (09:00 +0200)
committerPaul Hänsch <paul@plutz.net>
Wed, 18 Jul 2018 07:00:39 +0000 (09:00 +0200)
1  2 
indexmeta.sh
list.sh
widgets.sh

diff --cc indexmeta.sh
index 371c51f5dc010d9eb4394e401e536810e4bff932,2ac459fd484689e1a29979b512bf7b24eb792d20..45a3bac008b2ee469719d6ac2b91b3a0976b9178
@@@ -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"
diff --cc list.sh
Simple merge
diff --cc widgets.sh
Simple merge