diff --git a/dabo/analyze.sh b/dabo/analyze.sh index e16a2a6..27eea2e 100755 --- a/dabo/analyze.sh +++ b/dabo/analyze.sh @@ -19,10 +19,12 @@ function analyze { local file=$1 tmpfile=$(basename "${file}") - for bashfunc in $(find /etc/bash/gaboshlib -type f -name "g_*.bashfunc" -o -name "g_*.sh") - do - . "$bashfunc" - done + + . /etc/bash/gaboshlib.include + #for bashfunc in $(find /etc/bash/gaboshlib -type f -name "g_*.bashfunc" -o -name "g_*.sh") + #do + # . "$bashfunc" + #done . dabo/functions/check_buy_conditions.sh . dabo/functions/check_sell_conditions.sh . dabo/functions/get_vars_from_csv.sh diff --git a/dabo/functions/get_vars_from_csv.sh b/dabo/functions/get_vars_from_csv.sh index 9effc31..f2eea76 100644 --- a/dabo/functions/get_vars_from_csv.sh +++ b/dabo/functions/get_vars_from_csv.sh @@ -54,7 +54,8 @@ function get_vars_from_csv { # MACD get_var_from_line macd_histogram 8 - get_var_from_line macd_signal_relation 9 + #get_var_from_line macd_signal_relation 9 + f_macd_signal_relation="${f_last_line_array[9]}" f_macd_histogram_relation=$(echo "${f_macd_signal_relation}" | cut -d\| -f1) [ -z "$f_macd_histogram_relation" ] && return 1 f_macd_histogram_signal=$(echo "${f_macd_signal_relation}" | cut -d\| -f2)