From 8b5ffad49cde7aafaf4fdb94823579a9e11e1708 Mon Sep 17 00:00:00 2001 From: olli Date: Tue, 28 Nov 2023 17:04:01 +0100 Subject: [PATCH] analyze 2 analyze --- dabo/analyze.sh | 26 +++++++++++++------------ dabo/functions/check_sell_conditions.sh | 26 ++++++++++++------------- 2 files changed, 27 insertions(+), 25 deletions(-) diff --git a/dabo/analyze.sh b/dabo/analyze.sh index 9704e51..0ea761e 100755 --- a/dabo/analyze.sh +++ b/dabo/analyze.sh @@ -119,18 +119,20 @@ function analyze { fi fi - #if [ -n "${f_SELL}" ] - #then - # echo "SELL: ${f_date} ${f_SELL}" - # g_percentage-diff ${BUY_PRICE} ${f_price} - # g_calc "${g_percentage_diff_result}-${FEE}" - # result=${g_calc_result} - # echo "${result}" >>${g_tmp}/result-${tmpfile} - # rm -f "${f_TRADE_HIST_FILE}" - # rm -f "${f_TRADE_HIST_FILE_INTERIM}" - # unset f_open_trade - # echo "RESULT: ${result}% (${BUY_PRICE} -> ${f_price})" - #fi + if [ -n "${f_SELL}" ] + then + set -x + echo "SELL: ${f_date} ${f_SELL}" + g_percentage-diff ${BUY_PRICE} ${f_price} + g_calc "${g_percentage_diff_result}-${FEE}" + result=${g_calc_result} + echo "${result}" >>${g_tmp}/result-${tmpfile} + rm -f "${f_TRADE_HIST_FILE}" + rm -f "${f_TRADE_HIST_FILE_INTERIM}" + unset f_open_trade + echo "RESULT: ${result}% (${BUY_PRICE} -> ${f_price})" + set +x + fi ## Chart Part diff --git a/dabo/functions/check_sell_conditions.sh b/dabo/functions/check_sell_conditions.sh index f686b69..0d28bc0 100644 --- a/dabo/functions/check_sell_conditions.sh +++ b/dabo/functions/check_sell_conditions.sh @@ -99,19 +99,19 @@ function check_sell_conditions { fi fi - # ANALYZE - if [ -n "${f_SELL}" ] && [ -z "${BOT}" ] - then - echo "SELL: ${f_date} ${f_SELL}" - g_percentage-diff ${BUY_PRICE} ${f_price} - g_calc "${g_percentage_diff_result}-${FEE}" - result=${g_calc_result} - echo "${result}" >>${g_tmp}/result-${tmpfile} - rm -f "${f_TRADE_HIST_FILE}" - rm -f "${f_TRADE_HIST_FILE_INTERIM}" - unset f_open_trade - echo "RESULT: ${result}% (${BUY_PRICE} -> ${f_price})" - fi +# # ANALYZE +# if [ -n "${f_SELL}" ] && [ -z "${BOT}" ] +# then +# echo "SELL: ${f_date} ${f_SELL}" +# g_percentage-diff ${BUY_PRICE} ${f_price} +# g_calc "${g_percentage_diff_result}-${FEE}" +# result=${g_calc_result} +# echo "${result}" >>${g_tmp}/result-${tmpfile} +# rm -f "${f_TRADE_HIST_FILE}" +# rm -f "${f_TRADE_HIST_FILE_INTERIM}" +# unset f_open_trade +# echo "RESULT: ${result}% (${BUY_PRICE} -> ${f_price})" +# fi }