From b7945227ea72d01a95e8f36b63ad5d9a41644907 Mon Sep 17 00:00:00 2001 From: Dominika Liberda Date: Sat, 25 Jun 2022 11:03:39 +0200 Subject: [PATCH] * fix ampersand expansion --- src/template.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/template.sh b/src/template.sh index ff43684..004567a 100755 --- a/src/template.sh +++ b/src/template.sh @@ -3,7 +3,7 @@ # render(array, template_file) function render() { - local template="$(cat "$2")" + local template="$(cat "$2" | sed 's/\&/�UwU�/g')" local -n ref=$1 local tmp=$(mktemp) for key in ${!ref[@]}; do @@ -11,7 +11,7 @@ function render() { local value='' subtemplate=$(mktemp) subtemplate_tmp=$(mktemp) - echo "$template" | grep "{{start $key}}" -A99999 | grep "{{end $key}}" -B99999 | tr '\n' $'\01' > "$subtemplate" + echo "$template" | sed 's/\&/�UwU�/g' | grep "{{start $key}}" -A99999 | grep "{{end $key}}" -B99999 | tr '\n' $'\01' > "$subtemplate" echo 's'$'\02''\{\{start '"$key"'\}\}.*\{\{end '"$key"'\}\}'$'\02''\{\{'"$key"'\}\}'$'\02'';' >> "$tmp" @@ -93,7 +93,6 @@ function nested_add() { for i in ${!nested_ref[@]}; do declare -g -A _$nested_id[$i]="${nested_ref[$i]}" done - declare -p _$nested_id > /dev/stderr local -n ref=$1 ref+=("$nested_id")