From 893295807f4f1c694b4cee34048a7cbcbe165ac6 Mon Sep 17 00:00:00 2001
From: fred <support@qo-op.com>
Date: Fri, 15 Mar 2024 23:03:51 +0100
Subject: [PATCH] correct it

---
 20h12.process.sh          |  3 ++-
 RUNTIME/G1PalPay.sh       | 12 ++++++------
 RUNTIME/PLAYER.refresh.sh |  2 +-
 tools/PAY4SURE.sh         |  2 +-
 tools/my.sh               |  2 +-
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/20h12.process.sh b/20h12.process.sh
index 87544b26..70fefd40 100755
--- a/20h12.process.sh
+++ b/20h12.process.sh
@@ -46,7 +46,8 @@ mv ~/.zen/coucou ~/.zen/tmp/coucou
 
 ### DELAY _12345 ASTROPORT DURING 20H12 UPDATE ###
 MOATS=$(date -u +"%Y%m%d%H%M%S%4N")
-MOATS_plus_5_hours=$(date -u -d "$MOATS + 5 hours" +"%Y%m%d%H%M%S%4N")
+MOATS_plus_5_hours=$(date -d "now + 5 hours" +"%Y%m%d%H%M%S%4N")
+mkdir ~/.zen/tmp/${IPFSNODEID}
 echo ${MOATS_plus_5_hours} > ~/.zen/tmp/${IPFSNODEID}/_MySwarm.moats
 echo 9000 > ~/.zen/tmp/random.sleep
 
diff --git a/RUNTIME/G1PalPay.sh b/RUNTIME/G1PalPay.sh
index aebc2f34..41772857 100755
--- a/RUNTIME/G1PalPay.sh
+++ b/RUNTIME/G1PalPay.sh
@@ -132,6 +132,12 @@ while read LINE; do
     ## GET EMAILS FROM COMMENT
     TXIMAILS=($(echo "$COMMENT" | grep -E -o "\b[a-zA-Z0-9.%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,6}\b"))
 
+    echo "$TXIDATE $TXIPUBKEY $TXIAMOUNT [$TXIAMOUNTUD] $TXIMAILS % $SHARE %"
+    [[ $(echo "$TXIAMOUNT < 0" | bc) ]] \
+        && echo "TX-OUT" \
+        && echo "$TXIDATE" > ~/.zen/game/players/${PLAYER}/.atdate \
+        && continue
+
     ## DIVIDE INCOMING AMOUNT TO SHARE
     echo "N=${#TXIMAILS[@]}"
     N=${#TXIMAILS[@]}
@@ -139,12 +145,6 @@ while read LINE; do
     SHARE=$(makecoord ${SHAREE})
     ## SHARE is received AMOUT divided by numbers of EMAILS in comment
 
-    echo "$TXIDATE $TXIPUBKEY $TXIAMOUNT [$TXIAMOUNTUD] $TXIMAILS % $SHARE %"
-    [[ $(echo "$TXIAMOUNT < 0" | bc) ]] \
-        && echo "TX-OUT" \
-        && echo "$TXIDATE" > ~/.zen/game/players/${PLAYER}/.atdate \
-        && continue
-
     # let's loop over TXIMAILS
     for EMAIL in "${TXIMAILS[@]}"; do
 
diff --git a/RUNTIME/PLAYER.refresh.sh b/RUNTIME/PLAYER.refresh.sh
index b5c65cad..0bcc3370 100755
--- a/RUNTIME/PLAYER.refresh.sh
+++ b/RUNTIME/PLAYER.refresh.sh
@@ -184,7 +184,7 @@ for PLAYER in ${PLAYERONE[@]}; do
     echo "ASTROPORT ZenStation : ${ASTROPORT}"
     echo "TW was created $days days ago"
     ## REMOVE TW OLDER THAN 7 DAYS WITH AstroID
-    [[ -s ~/.zen/tmp/${MOATS}/AstroID.json && $days -gt 7 ]] \
+    [[ -s ~/.zen/tmp/${MOATS}/AstroID.json && $days -gt 7 && ( $COINS == "null" || $ZEN -le 10 ) ]] \
         && ${MY_PATH}/PLAYER.unplug.sh  "${HOME}/.zen/game/players/${PLAYER}/ipfs/moa/index.html" "${PLAYER}" "ALL" \
         && echo "(#__#) AstroID SECURITY ERROR (#__#)" && continue
 
diff --git a/tools/PAY4SURE.sh b/tools/PAY4SURE.sh
index 2a362481..e0934e73 100755
--- a/tools/PAY4SURE.sh
+++ b/tools/PAY4SURE.sh
@@ -47,7 +47,7 @@ sleep 3 ## Wait for ()&
     && echo "Valid AMOUNT=${AMOUNT}" \
     || { echo "ERROR NOT a valid AMOUNT : ${AMOUNT} - EXIT -" && exit 1; }
 [[ $(echo "$COINS < $AMOUNT" | bc -l) -eq 1 ]] \
-    && echo "ERROR : SOURCE WALLET IS MISSING COINS !!! $AMOUNT > $COINS - EXIT -" && exit 1
+    && echo "ERROR : SOURCE WALLET ${ISSUERPUB} IS MISSING COINS !!! $AMOUNT > $COINS - EXIT -" && exit 1
 
 [[ -z $G1PUB ]] && echo "ERROR : ${ISSUERPUB}=$COINS ($AMOUNT) MISSING DESTINATION - EXIT -" && exit 1
 echo
diff --git a/tools/my.sh b/tools/my.sh
index 697f7f0f..71ba9fa1 100755
--- a/tools/my.sh
+++ b/tools/my.sh
@@ -424,7 +424,7 @@ function makecoord() {
 
     if [[ ${input} =~ ^-?[0-9]+\.[0-9]$ ]]; then
         input="${input}0"
-    elif [[ ${input} =~ ^.[0-9]$ ]]; then
+    elif [[ ${input} =~ ^\.[0-9]+$ ]]; then
         input="0${input}"
     elif [[ ${input} =~ ^-?[0-9]+\.$ ]]; then
         input="${input}00"