From 567e6541f85df617ee359f698f90965cea29ef08 Mon Sep 17 00:00:00 2001 From: Landon Curt Noll Date: Mon, 14 Oct 2024 13:24:02 -0700 Subject: [PATCH] fix entry2csv.sh to not damage award strings The `bin/entry2csv.sh` too was modified to leave \uxxxx in awards alone and to NOT convert it. Changed `bin/entry2csv.sh` VERSION from "1.5.1 2024-10-10" to "1.6 2024-10-14". Performed `make entry2csv` and `make csv2entry` to test the above under macOS. --- bin/entry2csv.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/entry2csv.sh b/bin/entry2csv.sh index 59f12f077..c018c83a0 100755 --- a/bin/entry2csv.sh +++ b/bin/entry2csv.sh @@ -118,7 +118,7 @@ shopt -s lastpipe # explicitly run the last command of the pipe line in the curr # set variables referenced in the usage message # -export VERSION="1.5.1 2024-10-10" +export VERSION="1.6 2024-10-14" NAME=$(basename "$0") export NAME export V_FLAG=0 @@ -218,12 +218,12 @@ function output_award # PATTERN='$..award' if [[ $V_FLAG -ge 5 ]]; then - echo "$0: debug[5]: about to run: $JVAL_WRAPPER -b -q -- $ENTRY_JSON_PATH '$PATTERN' | $JSTRDECODE -N -" 1>&2 + echo "$0: debug[5]: about to run: $JVAL_WRAPPER -b -q -- $ENTRY_JSON_PATH '$PATTERN'" 1>&2 fi - "$JVAL_WRAPPER" -b -q "$ENTRY_JSON_PATH" "$PATTERN" | "$JSTRDECODE" -N - + "$JVAL_WRAPPER" -b -q "$ENTRY_JSON_PATH" "$PATTERN" status_codes=("${PIPESTATUS[@]}") if [[ ${status_codes[*]} =~ [1-9] ]]; then - echo "$0: ERROR: in output_award: $JVAL_WRAPPER -b -q -- $ENTRY_JSON_PATH '$PATTERN' | $JSTRDECODE -N - failed," \ + echo "$0: ERROR: in output_award: $JVAL_WRAPPER -b -q -- $ENTRY_JSON_PATH '$PATTERN' failed," \ "error codes: ${status_codes[*]}" 1>&2 return 5 fi