about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorCase Duckworth2023-01-06 16:39:05 -0600
committerCase Duckworth2023-01-06 16:39:05 -0600
commit9d3fdcfe5ee1a6ec449b5d9e3114f9556faeb953 (patch)
tree3b8e44e18f8f9658f2e2f0b9de57a0a45647ec0d
parentReverse order of phtml and expand in filters (diff)
downloadvienna-9d3fdcfe5ee1a6ec449b5d9e3114f9556faeb953.tar.gz
vienna-9d3fdcfe5ee1a6ec449b5d9e3114f9556faeb953.zip
Actually fix the --> bug
... I hope...
-rwxr-xr-xvienna4
1 files changed, 2 insertions, 2 deletions
diff --git a/vienna b/vienna index 9080571..a624538 100755 --- a/vienna +++ b/vienna
@@ -230,7 +230,7 @@ expand() { # expand TEMPLATE... < INPUT
230 end="expand_:_${count:=0}_:_end" 230 end="expand_:_${count:=0}_:_end"
231 eval "$( 231 eval "$(
232 echo "cat<<$end" 232 echo "cat<<$end"
233 shellfix "$@" | sed 's/^-->$//' 233 shellfix "$@"
234 echo 234 echo
235 echo "$end" 235 echo "$end"
236 )" && count=$((count + 1)) 236 )" && count=$((count + 1))
@@ -263,7 +263,7 @@ meta() { # meta FIELD [FILE] < INPUT
263 file="${2:-$FILE}" 263 file="${2:-$FILE}"
264 metafile="${TMPD:=.}/${file}.meta" 264 metafile="${TMPD:=.}/${file}.meta"
265 test -f "$metafile" || 265 test -f "$metafile" ||
266 sed '/<!--/!q;/<!--/n;/-->/q' >"$metafile" 266 sed -n '/<!--/!q;/<!--/n;p;/-->/q' >"$metafile"
267 sed -n "s/^[ \t]*$field:[ \t]*//p" <"$metafile" 267 sed -n "s/^[ \t]*$field:[ \t]*//p" <"$metafile"
268} 268}
269 269