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/freeamo | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'subprojects/freeamo/freeamo') diff --git a/subprojects/freeamo/freeamo b/subprojects/freeamo/freeamo index 2c036e9..abd8250 100755 --- a/subprojects/freeamo/freeamo +++ b/subprojects/freeamo/freeamo @@ -23,7 +23,7 @@ source "$run_path/src/main_functions" source "$run_path/freeamo.conf" -#source "$run_path/src/err" +source "$run_path/src/err" output_file_1="$run_path/build/index-search-pages.txt"; output_file_2="$run_path/build/index-search-pages--free-licenses.txt" @@ -36,8 +36,8 @@ if [ "$1" == "--debug" ] || [ "$2" == "--debug" ]; then else - debug=false; - unset debug_arg; + debug=false + unset debug_arg fi @@ -55,31 +55,32 @@ if [ ! -f /usr/bin/wget ]; then echo "/usr/bin/wget not found!"; exit=true; fi if [[ $exit == true ]]; then exit 1; fi + case "$1" in ""|--debug|--normal-mode) - freeamo_command="$0 --conf-note $debug_arg :" + freeamo_command="$0 --conf-note $debug_arg" echo "$freeamo_command"; $freeamo_command - freeamo_command="$0 --remove-build $debug_arg :" + freeamo_command="$0 --remove-build $debug_arg" echo "$freeamo_command"; $freeamo_command - freeamo_command="$0 --conf-copy $debug_arg :" + freeamo_command="$0 --conf-copy $debug_arg" echo "$freeamo_command"; $freeamo_command - freeamo_command="$0 --search-pages $debug_arg :" + freeamo_command="$0 --search-pages $debug_arg" echo "$freeamo_command"; $freeamo_command - freeamo_command="$0 --get-licenses $debug_arg :" + freeamo_command="$0 --get-licenses $debug_arg" echo "$freeamo_command"; $freeamo_command - freeamo_command="$0 --get-add-ons $debug_arg :" + freeamo_command="$0 --get-add-ons $debug_arg" echo "$freeamo_command"; $freeamo_command if [ ! "$1" == "--normal-mode" ]; then - freeamo_command="$0 --make-directory.fsf.org-wiki $debug_arg :" + freeamo_command="$0 --make-directory.fsf.org-wiki $debug_arg" echo "$freeamo_command"; $freeamo_command fi -- cgit v1.2.3