From b6ca88eb4793b3442ba6b1fe350169a7e0668945 Mon Sep 17 00:00:00 2001 From: Ian Kelling Date: Wed, 25 Jul 2018 21:01:13 -0400 Subject: progress toward making things work with err: remove : to fix command not found error. remove ((line++)) reference to unset variable error add missing line initialization fix style, prefer 'x"x' to "x\"x" for readability turn off pv when debug is set, it's messing up stack trace output --- subprojects/freeamo/src/main_functions | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'subprojects/freeamo/src/main_functions') diff --git a/subprojects/freeamo/src/main_functions b/subprojects/freeamo/src/main_functions index 3eb673e..453485a 100644 --- a/subprojects/freeamo/src/main_functions +++ b/subprojects/freeamo/src/main_functions @@ -65,8 +65,8 @@ function locale_description { echo "####################" - tmp__enUS=$(jq ".results[$entry].$locale_description" "$file" | sed "s|-||;" | jq .enUS | sed "s|^\"||; s|\"$||;" ) - tmp__enGB=$(jq ".results[$entry].$locale_description" "$file" | sed "s|-||;" | jq .enGB | sed "s|^\"||; s|\"$||;" ) + tmp__enUS=$(jq ".results[$entry].$locale_description" "$file" | sed "s|-||;" | jq .enUS | sed 's|^"||; s|"$||;' ) + tmp__enGB=$(jq ".results[$entry].$locale_description" "$file" | sed "s|-||;" | jq .enGB | sed 's|^"||; s|"$||;' ) tmp=$(jq ".results[$entry].$locale_description[]" "$file" | head -n 1 | sed "s|^\"||; s|\"$||;"); # Use the first avalible if English is not avaliable @@ -212,7 +212,7 @@ function essential_addon { function pv__progress { - if [ ! "$pv__discard" = true ]; then + if [ ! "$pv__discard" = true ] && ! $debug; then (pv --progress --line-mode --size "$pv__size" --timer) > /dev/null -- cgit v1.2.3