diff --git a/dabo/analyze.sh b/dabo/analyze.sh index 91c5fe1..9704e51 100755 --- a/dabo/analyze.sh +++ b/dabo/analyze.sh @@ -119,18 +119,18 @@ 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 + # 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 ## Chart Part diff --git a/dabo/functions/check_sell_conditions.sh b/dabo/functions/check_sell_conditions.sh index 34b3948..f686b69 100644 --- a/dabo/functions/check_sell_conditions.sh +++ b/dabo/functions/check_sell_conditions.sh @@ -99,24 +99,19 @@ function check_sell_conditions { fi fi -# # ANALYZE -# if [ -n "${f_SELL}" ] && [ -z "${BOT}" ] -# then -# echo "SELL: ${f_date} ${f_SELL}" -## echo "${csv_headline},Marketperformace -##${f_last_line}" | cut -d, -f 2-22 | perl -pe 's/([0-9].[0-9][0-9][0-9][0-9][0-9][0-9])[0-9]+/$1/g' | perl -pe 's/((?<=,)|(?<=^)),/ ,/g;' | column -t -s, -## echo "${f_SELL}" -# g_percentage-diff ${BUY_PRICE} ${f_price} -# #result=${g_percentage_diff_result} -# 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} -> ${current})" -# 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 }