common-utils.sh: Fix _json_escape function for OSX sed | Resolve #162

labbots · Jun 15, 2021 · dd07a4d · dd07a4d
1 parent 5295b76
commit dd07a4d
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 30 deletions.
diff --git a/sh/common-utils.sh b/sh/common-utils.sh
@@ -183,19 +183,17 @@ _json_escape() {
     # just for refrence "s|'|\'|g"
     if [ "${mode_json_escape}" = "j" ]; then
         output_json_escape="$(printf "%s" "${input_json_escape}" | sed \
-            -e "s|'\'|'\\'|g" \
-            -e "s|'/'|'\/'|g" \
+            -e "s|\\\|\\\\\\\|g" \
+            -e "s|\/|\\\/|g" \
             -e 's/\"/\\\"/g' \
-            -e ':a; $!N' \
-            -e 's|\t|\\t|g' \
-            -e 's|\r|\\r|g' \
-            -e 's|\f|\\f|g')"
+            -e "s/$(printf '\t')/\\t/g" \
+            -e "s/$(printf '\r')/\\r/g" \
+            -e "s/$(printf '\f')/\\f/g")"
     else
         output_json_escape="$(printf "%s" "${input_json_escape}" | sed \
-            -e ':a; $!N' \
-            -e 's|\t|\\t|g' \
-            -e 's|\r|\\r|g' \
-            -e 's|\f|\\f|g')"
+            -e "s/$(printf '\t')/\\t/g" \
+            -e "s/$(printf '\r')/\\r/g" \
+            -e "s/$(printf '\f')/\\f/g")"
     fi
     # use awk because sed just messes up with newlines
     output_json_escape="$(printf "%s" "${output_json_escape}" | awk '{printf "%s%s",sep,$0; sep="\\n"} END{print ""}')"

diff --git a/sh/release/gsync b/sh/release/gsync
@@ -184,19 +184,17 @@ _json_escape() {
     # just for refrence "s|'|\'|g"
     if [ "${mode_json_escape}" = "j" ]; then
         output_json_escape="$(printf "%s" "${input_json_escape}" | sed \
-            -e "s|'\'|'\\'|g" \
-            -e "s|'/'|'\/'|g" \
+            -e "s|\\\|\\\\\\\|g" \
+            -e "s|\/|\\\/|g" \
             -e 's/\"/\\\"/g' \
-            -e ':a; $!N' \
-            -e 's|\t|\\t|g' \
-            -e 's|\r|\\r|g' \
-            -e 's|\f|\\f|g')"
+            -e "s/$(printf '\t')/\\t/g" \
+            -e "s/$(printf '\r')/\\r/g" \
+            -e "s/$(printf '\f')/\\f/g")"
     else
         output_json_escape="$(printf "%s" "${input_json_escape}" | sed \
-            -e ':a; $!N' \
-            -e 's|\t|\\t|g' \
-            -e 's|\r|\\r|g' \
-            -e 's|\f|\\f|g')"
+            -e "s/$(printf '\t')/\\t/g" \
+            -e "s/$(printf '\r')/\\r/g" \
+            -e "s/$(printf '\f')/\\f/g")"
     fi
     # use awk because sed just messes up with newlines
     output_json_escape="$(printf "%s" "${output_json_escape}" | awk '{printf "%s%s",sep,$0; sep="\\n"} END{print ""}')"

diff --git a/sh/release/gupload b/sh/release/gupload
@@ -184,19 +184,17 @@ _json_escape() {
     # just for refrence "s|'|\'|g"
     if [ "${mode_json_escape}" = "j" ]; then
         output_json_escape="$(printf "%s" "${input_json_escape}" | sed \
-            -e "s|'\'|'\\'|g" \
-            -e "s|'/'|'\/'|g" \
+            -e "s|\\\|\\\\\\\|g" \
+            -e "s|\/|\\\/|g" \
             -e 's/\"/\\\"/g' \
-            -e ':a; $!N' \
-            -e 's|\t|\\t|g' \
-            -e 's|\r|\\r|g' \
-            -e 's|\f|\\f|g')"
+            -e "s/$(printf '\t')/\\t/g" \
+            -e "s/$(printf '\r')/\\r/g" \
+            -e "s/$(printf '\f')/\\f/g")"
     else
         output_json_escape="$(printf "%s" "${input_json_escape}" | sed \
-            -e ':a; $!N' \
-            -e 's|\t|\\t|g' \
-            -e 's|\r|\\r|g' \
-            -e 's|\f|\\f|g')"
+            -e "s/$(printf '\t')/\\t/g" \
+            -e "s/$(printf '\r')/\\r/g" \
+            -e "s/$(printf '\f')/\\f/g")"
     fi
     # use awk because sed just messes up with newlines
     output_json_escape="$(printf "%s" "${output_json_escape}" | awk '{printf "%s%s",sep,$0; sep="\\n"} END{print ""}')"