From 5c0d888bac8918e0de17634a545eb7343b3060b6 Mon Sep 17 00:00:00 2001
From: qo-op <support@qo-op.com>
Date: Wed, 18 Dec 2019 00:54:42 +0100
Subject: [PATCH] SMS RAZ

---
 shell/cron_G1TAG_REFRESH.sh     |  2 +-
 shell/manual_BILLETS_PERIMES.sh |  2 +-
 shell/sms_DESTROY.sh            | 22 +++++++++++-----------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/shell/cron_G1TAG_REFRESH.sh b/shell/cron_G1TAG_REFRESH.sh
index debb381..ff4251d 100755
--- a/shell/cron_G1TAG_REFRESH.sh
+++ b/shell/cron_G1TAG_REFRESH.sh
@@ -45,7 +45,7 @@ for tag in ./wallets/.$IPFSNODEID/TAG/*; do
     oldtagn=$(cat ./TAG/${RR}.old/TAG_n)
     curtagn=$(cat ./TAG/${RR}/TAG_n)
     oldtagchain=$(cat ./TAG/${RR}.old/TAG_chain)
-    curtagchain=$(cat ./TAG/${RR}/TAG_chain) 
+    curtagchain=$(cat ./TAG/${RR}/TAG_chain)
     echo "__SUB:cron_G1TAG_REFRESH.sh: ./TAG/$RR VALUE: ($oldtagn) $oldtagval ZEN -> ($curtagn) $curtagval ZEN"
     echo "__SUB:cron_G1TAG_REFRESH.sh: $oldtagchain -> $curtagchain"
 
diff --git a/shell/manual_BILLETS_PERIMES.sh b/shell/manual_BILLETS_PERIMES.sh
index 3961903..8b202c0 100755
--- a/shell/manual_BILLETS_PERIMES.sh
+++ b/shell/manual_BILLETS_PERIMES.sh
@@ -39,7 +39,7 @@ for result in $(find billets/ -daystart -mtime +$vieux -type d -name "*"); do
         PAY=$(/usr/local/bin/silkaj -p duniter-g1.p2p.legal:443 tx --amount="$virement" --output="$dest" -y)
 
         if [[ ! $(echo $PAY | grep "successfully sent") ]]; then
-            echo "!!!! ERREUR: Something Wrong happened with $result"
+            echo "!!!! ERREUR: $virement Something Wrong happened with $result"
             if [[ ! $virement ]]; then mv $result /tmp/$result; fi
         else
             echo "Tout s'est bien passé! On supprime $result et continue avec le billet $Nbillets"
diff --git a/shell/sms_DESTROY.sh b/shell/sms_DESTROY.sh
index 372309a..01f2142 100755
--- a/shell/sms_DESTROY.sh
+++ b/shell/sms_DESTROY.sh
@@ -43,6 +43,17 @@ if [[ "$MEMBERUID" == "DON" || "$MEMBERUID" == "" || "$MEMBERUID" == "$MEMBER" ]
     if [[ "$(echo $PAY | cut -d '|' -f 1)" != "KO" && "$PAY" != "" && "$(echo $back | cut -d '|' -f 1)" != "KO" ]]; then
         # DESTROY FILESYSTEM AND G1sms WALLET SWARM REFERENCE 
         if [[ "$PHONE" != "" ]]; then
+# SEND SMS BEFORE DELETE FOLDER
+mess="[G1sms+] $PAY
+Portefeuille détruit!
+Viré vers $MEMBER 
+$MEMRIB
+
+Merci, à bientôt.
+$ADMINPSEUDO @ $NODEUIDNA
+$back"
+sms_SEND "$PHONE" "$mess"
+
             rm -Rf ./wallets/$PHONE;
             rm -Rf ./wallets_swarm/$PHONE;
             cents=$(echo $(bc -l <<< "scale=0; $GETLIMIT * 100") | cut -d '.' -f 1) 
@@ -60,17 +71,6 @@ if [[ "$MEMBERUID" == "DON" || "$MEMBERUID" == "" || "$MEMBERUID" == "$MEMBER" ]
     fi
 fi
 
-mess="[G1sms+] $PAY
-Portefeuille détruit!
-Viré vers $MEMBER 
-$MEMRIB
-
-Merci, à bientôt.
-$ADMINPSEUDO @ $NODEUIDNA
-$back"
-
-sms_SEND "$PHONE" "$mess"
-
 # Remove contact from database
 rm_contact $MEMBERUID $PHONE && log "${c_green}Contact has been deleted from database$c_" || "${c_red}Contact can't be deleted database$c_"