diff --git a/dabo/functions/check_sell_conditions.sh b/dabo/functions/check_sell_conditions.sh index 508e59b..0dcae66 100644 --- a/dabo/functions/check_sell_conditions.sh +++ b/dabo/functions/check_sell_conditions.sh @@ -36,14 +36,6 @@ function check_sell_conditions { # store new interim result echo ${f_BUY_PRICE_LAST_RATE_DIFF} >>${f_TRADE_HIST_FILE_INTERIM} - - # Check for filled buy conditions - if filled don't sell - if ! check_buy_conditions ${f_ASSET_HIST_FILE} SELL - then - g_echo_note "${f_echo_prefix}Buy-Conditions met - Dont Sell" - return 0 - fi - # run strategies local f_strategy_path=../../strategies [ -z "${BOT}" ] && f_strategy_path=strategies @@ -57,7 +49,18 @@ function check_sell_conditions { break fi done - + + if [ -n "$f_SELL" ] + then + # Check for filled buy conditions - if filled don't sell + echo " ${f_echo_prefix}Checking for filles Buy Conditions" + if ! check_buy_conditions ${f_ASSET_HIST_FILE} SELL + then + g_echo_note " ${f_echo_prefix}Buy-Conditions met - Dont Sell" + return 0 + fi + fi + ### Sell or not sell? # BOT @@ -201,7 +204,7 @@ function check_sell_conditions_strategy { then if [ $(echo "(${f_BUY_PRICE_LAST_RATE_DIFF} + -${FEE}) < 0" | bc -l) -ne 0 ] then - echo " Result negative - holding (INTERIM RESULT ${f_BUY_PRICE_LAST_RATE_DIFF}% - FEE ${FEE}% < 0" + echo " Result negative - holding (INTERIM RESULT ${f_BUY_PRICE_LAST_RATE_DIFF}% - FEE ${FEE}% < 0 --> Ignoring ${f_SELL}" f_SELL="" fi fi