HandBrake/HandBrake-docs
1
0
Fork 0
mirror of https://github.com/HandBrake/HandBrake-docs.git synced 2025-12-10 00:44:52 -06:00
Code Issues Packages Projects Releases 1 Wiki Activity

build: Update to marsh 0.8.1.

Browse Source
This commit is contained in:
Bradley Sepos 2021-12-26 14:14:57 -05:00
parent 737b0e25d0
commit f1f26d8cd3
No known key found for this signature in database
GPG Key ID: DEADE2F57D42D9C7
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
marsh
View File

@ -1,12 +1,12 @@
#!/bin/bash #!/bin/bash
# marsh - build static websites using markdown and bash # marsh - build static websites using markdown and bash
# #
# Copyright 2018 Bradley Sepos # Copyright 2021 Bradley Sepos
# Released under the MIT License. See LICENSE for details. # Released under the MIT License. See LICENSE for details.
# https://github.com/bradleysepos/marsh # https://github.com/bradleysepos/marsh
NAME="marsh" NAME="marsh"
VERSION="0.8.0" VERSION="0.8.1"
SELF="${BASH_SOURCE[0]}" SELF="${BASH_SOURCE[0]}"
SELF_DIR=$(cd $(dirname "${BASH_SOURCE[0]}") && pwd -P) SELF_DIR=$(cd $(dirname "${BASH_SOURCE[0]}") && pwd -P)
SELF_DIR="${SELF_DIR:-$(pwd)}" SELF_DIR="${SELF_DIR:-$(pwd)}"
@ -1089,7 +1089,7 @@ function build_template { # build_template dest_dir target_dir document templat
for ITEM in ${LIST[@]}; do for ITEM in ${LIST[@]}; do
cp "${FILE}" "${FILE_TEMP}" cp "${FILE}" "${FILE_TEMP}"
<"${FILE_TEMP}" \ <"${FILE_TEMP}" \
awk '/^[ ]*\{\%[ ]*if[ ]+'${TAG//\./\.}'[ ]+'${COMPARITOR// /[ ]+}'[ ]+"'${ITEM}'"[ ]*\%\}[ ]*$/ { awk '/^[ ]*\{%[ ]*if[ ]+'${TAG//\./\.}'[ ]+'${COMPARITOR// /[ ]+}'[ ]+"'${ITEM}'"[ ]*%\}[ ]*$/ {
tag=1; tag=1;
line=1; line=1;
delete buffer; delete buffer;
@ -1097,16 +1097,16 @@ function build_template { # build_template dest_dir target_dir document templat
{ {
buffer[line++]=$0; buffer[line++]=$0;
} }
(tag==1 && (/^[ ]*\{\%[ ]*endif[ ]*\%\}[ ]*$/ || /^[ ]*\{\%[ ]*else[ ]*\%\}[ ]*$/)) { (tag==1 && (/^[ ]*\{%[ ]*endif[ ]*%\}[ ]*$/ || /^[ ]*\{%[ ]*else[ ]*%\}[ ]*$/)) {
for (i=2; i < line-1; i++) { for (i=2; i < line-1; i++) {
print buffer[i]; print buffer[i];
} }
} }
(tag>0 && /^[ ]*\{\%[ ]*else[ ]*\%\}[ ]*$/) { (tag>0 && /^[ ]*\{%[ ]*else[ ]*%\}[ ]*$/) {
tag=2; tag=2;
next; next;
} }
(tag>0 && /^[ ]*\{\%[ ]*endif[ ]*\%\}[ ]*$/) { (tag>0 && /^[ ]*\{%[ ]*endif[ ]*%\}[ ]*$/) {
tag=0; tag=0;
next; next;
} }
@ -1118,7 +1118,7 @@ function build_template { # build_template dest_dir target_dir document templat
# process else # process else
cp "${FILE}" "${FILE_TEMP}" cp "${FILE}" "${FILE_TEMP}"
<"${FILE_TEMP}" \ <"${FILE_TEMP}" \
awk '/^[ ]*\{\%[ ]*if[ ]+'${TAG//\./\.}'[ ]+'${COMPARITOR// /[ ]+}'[ ]+".+"[ ]*\%\}[ ]*$/ { awk '/^[ ]*\{%[ ]*if[ ]+'${TAG//\./\.}'[ ]+'${COMPARITOR// /[ ]+}'[ ]+".+"[ ]*%\}[ ]*$/ {
tag=1; tag=1;
line=1; line=1;
delete buffer; delete buffer;
@ -1129,16 +1129,16 @@ function build_template { # build_template dest_dir target_dir document templat
(tag==1) { (tag==1) {
delete buffer; delete buffer;
} }
(tag==2 && /^[ ]*\{\%[ ]*endif[ ]*\%\}[ ]*$/) { (tag==2 && /^[ ]*\{%[ ]*endif[ ]*%\}[ ]*$/) {
for (i=2; i < line-1; i++) { for (i=2; i < line-1; i++) {
print buffer[i]; print buffer[i];
} }
} }
(tag>0 && /^[ ]*\{\%[ ]*else[ ]*\%\}[ ]*$/) { (tag>0 && /^[ ]*\{%[ ]*else[ ]*%\}[ ]*$/) {
tag=2; tag=2;
next; next;
} }
(tag>0 && /^[ ]*\{\%[ ]*endif[ ]*\%\}[ ]*$/) { (tag>0 && /^[ ]*\{%[ ]*endif[ ]*%\}[ ]*$/) {
tag=0; tag=0;
next; next;
} }
@ -1154,7 +1154,7 @@ function build_template { # build_template dest_dir target_dir document templat
FILE_TEMP=$(mktemp "${MARSH_TEMP}/conditional-XXXXXX") FILE_TEMP=$(mktemp "${MARSH_TEMP}/conditional-XXXXXX")
# remove unsupported conditionals # remove unsupported conditionals
cp "${FILE}" "${FILE_TEMP}" cp "${FILE}" "${FILE_TEMP}"
<"${FILE_TEMP}" awk '/^[ ]*\{\%[ ]*if[^%]+\%\}[ ]*$/ {k=1;i=1;delete a} {a[i++]=$0} (k==1 && /^[ ]*\{\%[ ]*endif[ ]*\%\}[ ]*$/) {k=0;next} (k==0) { print }' > "${FILE}" <"${FILE_TEMP}" awk '/^[ ]*\{%[ ]*if[^%]+%\}[ ]*$/ {k=1;i=1;delete a} {a[i++]=$0} (k==1 && /^[ ]*\{%[ ]*endif[ ]*%\}[ ]*$/) {k=0;next} (k==0) { print }' > "${FILE}"
return 0 return 0
} }
@ -2233,7 +2233,7 @@ for I in "${!MARKDOWN_OPTIONS[@]}"; do
done done
OIFS="${IFS}" OIFS="${IFS}"
IFS=$'\n' IFS=$'\n'
MARKDOWN_UNKNOWN=($(echo "test options" | "${MARKDOWN}" ${MARKDOWN_OPTIONS[@]} -VV 2>&1 >/dev/null | grep -i "unknown" | sed -E -e 's/^markdown: unknown option <([^>]+)>$/\1/')) MARKDOWN_UNKNOWN=($("${MARKDOWN}" ${MARKDOWN_OPTIONS[@]} -VV 2>&1 >/dev/null | grep -i "unknown" | sed -E -e 's/^markdown: unknown option <([^>]+)>$/\1/'))
IFS="${OIFS}" IFS="${OIFS}"
if [[ "${#MARKDOWN_UNKNOWN[@]}" -gt 0 ]]; then if [[ "${#MARKDOWN_UNKNOWN[@]}" -gt 0 ]]; then
echo -n "Unknown markdown options:" >&2 echo -n "Unknown markdown options:" >&2