From ee8e56b40157926af1a3058083bebd65b9ffecd4 Mon Sep 17 00:00:00 2001 From: Chris Renshaw Date: Fri, 31 May 2024 10:00:02 -0300 Subject: [PATCH] migrate.sh: check only trailing quote - fixes grep_check_json for prop entries with leading wildcard --- module/migrate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/migrate.sh b/module/migrate.sh index 30c5c8f..12975b1 100644 --- a/module/migrate.sh +++ b/module/migrate.sh @@ -15,7 +15,7 @@ esac; item() { echo "- $@"; } die() { [ "$INSTALL" ] || echo "$N$N! $@"; exit 1; } -grep_get_json() { eval set -- "$(cat "$FILE" | tr -d '\r\n' | grep -m1 -o "\"$1\""'.*' | cut -d: -f2-)"; echo "$1" | sed -e 's|"|\\\\\\"|g' -e 's|[,}]*$||'; } +grep_get_json() { eval set -- "$(cat "$FILE" | tr -d '\r\n' | grep -m1 -o "$1"'".*' | cut -d: -f2-)"; echo "$1" | sed -e 's|"|\\\\\\"|g' -e 's|[,}]*$||'; } grep_check_json() { grep -q "$1" "$FILE" && [ "$(grep_get_json $1)" ]; } case "$1" in