From 0501e33ace452cb505e2771fe30079477a251aed Mon Sep 17 00:00:00 2001 From: fred Date: Sat, 6 Jan 2024 19:18:06 +0100 Subject: [PATCH] GRATITUDE COINScheck PAY4SURE --- RUNTIME/VOEUX.refresh.sh | 2 +- tools/PAY4SURE.sh | 5 ++--- tools/RSS2UPlanetTW.sh | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/RUNTIME/VOEUX.refresh.sh b/RUNTIME/VOEUX.refresh.sh index 568b95dce..38ccd9eef 100755 --- a/RUNTIME/VOEUX.refresh.sh +++ b/RUNTIME/VOEUX.refresh.sh @@ -289,7 +289,7 @@ if [[ ${wishnumbers} -gt 0 ]]; then GRATITUDE=$($MY_PATH/../tools/getcoins_from_gratitude_box.sh) G1AMOUNT=$(echo "$GRATITUDE / 10" | bc -l | xargs printf "%.2f" ) echo "***** PLAYER $PLAYER *************************************" - echo "SEND ${GRATITUDE} ZEN = ${G1AMOUNT} G1 + echo "GRATITUDE ${GRATITUDE} ZEN = ${G1AMOUNT} G1 to ${SECTOR} WALLET ${SECTORG1PUB}" echo "************************************************************" MYWISHFLUX=$(ipfs add -qHwr ~/.zen/tmp/${IPFSNODEID}/WISH/${PLAYER}/g1voeu/* | tail -n 1) # ADDING JSONS TO IPFS diff --git a/tools/PAY4SURE.sh b/tools/PAY4SURE.sh index 4e354df96..83d2f2ede 100755 --- a/tools/PAY4SURE.sh +++ b/tools/PAY4SURE.sh @@ -38,9 +38,8 @@ COINS=$($MY_PATH/COINScheck.sh ${PAYOUTPUB} | tail -n 1) ###### TEST INPUT VALUES [[ $AMOUNT == "ALL" ]] && AMOUNT=$COINS ## ALL MEAN EMPTY ORIGIN WALLET [[ -z $AMOUNT ]] && echo "ERROR : ${PAYOUTPUB}=$COINS MISSING AMOUNT" && exit 1 -if ! [[ $AMOUNT =~ '^[0-9]+([.][0-9]+)?$' ]] ; then - echo "ERROR : AMOUNT ($AMOUNT) is Not a number" && exit 1 -fi +[[ $AMOUNT =~ ^[0-9]+([.][0-9]+)?$ ]] && echo "Valid AMOUNT=${AMOUNT}" || { echo "ERROR NOT a valid AMOUNT : ${AMOUNT}" && exit 1; } + [[ $(echo "$COINS < $AMOUNT" | bc -l) -eq 1 ]] && echo "ERROR : SOURCE WALLET IS MISSING COINS !!! $AMOUNT > $COINS" && exit 1 [[ -z $G1PUB ]] && echo "ERROR : ${PAYOUTPUB}=$COINS ($AMOUNT) MISSING DESTINATION" && exit 1 diff --git a/tools/RSS2UPlanetTW.sh b/tools/RSS2UPlanetTW.sh index a4373c52f..080eb9a17 100755 --- a/tools/RSS2UPlanetTW.sh +++ b/tools/RSS2UPlanetTW.sh @@ -209,7 +209,7 @@ if [[ ${gloups} -gt 0 && ${ASTROG1} ]]; then GRATITUDE=$($MY_PATH/../tools/getcoins_from_gratitude_box.sh) G1AMOUNT=$(echo "$GRATITUDE / 10" | bc -l | xargs printf "%.2f" ) echo "***** SECTOR $SECTOR *************************************" - echo "SEND ${GRATITUDE} ZEN = ${G1AMOUNT} G1 + echo "GRATITUDE ${GRATITUDE} ZEN = ${G1AMOUNT} G1 to ${PLAYER} WALLET ${ASTROG1}" echo "************************************************************" ${MY_PATH}/../tools/PAY4SURE.sh ~/.zen/tmp/${MOATS}/sector.dunikey "${G1AMOUNT}" "${ASTROG1}" "THANKS ${gloops} GLOOPS"