From 46b1e1df4cfe225d4e6a13aa397ae6c1966c6a35 Mon Sep 17 00:00:00 2001
From: qo-op <support@qo-op.com>
Date: Mon, 12 Jul 2021 21:17:47 +0200
Subject: [PATCH] that is better, for sure

---
 sms/GUILDE.sh   |  9 +++++----
 sms_received.sh | 11 +++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/sms/GUILDE.sh b/sms/GUILDE.sh
index 96f4e32..61d0453 100755
--- a/sms/GUILDE.sh
+++ b/sms/GUILDE.sh
@@ -165,7 +165,7 @@ echo "## INSCRIPTION PHONE / GUILDE : ${phone} / ${guilde}"
 ########################################################################
 ## NOUVELLE INSCRIPTION GUILDE (pas encore de lien INPUT/${phone})
 [[ ! -L /home/${YOU}/.zen/SMS/PHONE/${phonehash}/GUILDES/${guilde} ]] && echo "#!/bin/bash
-sudo gammu sendsms TEXT \"_PHONE_\" -text \"${xzuid}, bienvenue dans la guilde ${guilde} partagez nos actions pour changer le monde https://oasis.astroport.com\"" > /home/${YOU}/.zen/SMS/PHONE/${phonehash}/000.${guilde}.tosend.sh
+sudo gammu sendsms TEXT \"_PHONE_\" -text \"${xzuid} synchronisez vos actions, changez le monde https://oasis.astroport.com - GUILDE ${guilde} -\"" > /home/${YOU}/.zen/SMS/PHONE/${phonehash}/000.${guilde}.tosend.sh
 
 ########################################################################
 ## COMBIEN D'ETOILES GCHANGE ?? ADMIN
@@ -178,16 +178,17 @@ SCORE=$(echo $XUIDSCORE | cut -d '.' -f 1)
 echo "***** ${xzuid} SCORE GCHANGE = $SCORE *****"
 ## MESSAGE DU GUIDE DE LA GUILDE OU DE L'ADMIN DE LA STATION ?
 if [[ $SCORE -ge 4 || ${phone} == $SMSADMIN ]]; then
-
+    [[ ${phone} == $SMSADMIN ]] && SCORE=5 ## ADMIN SCORE=5
+    
     echo "GUILDE ADMIN ${guilde}/OUTPUT/"
     mkdir -p /home/${YOU}/.zen/SMS/GUILDES/${guilde}/MEMBERS/
     mkdir -p /home/${YOU}/.zen/SMS/GUILDES/${guilde}/INPUT/
     mkdir -p /home/${YOU}/.zen/SMS/GUILDES/${guilde}/OUTPUT/
 
-    ## PREPARATION DU MESSAGE POUR LA GUILDE (cut for long messages)
+    ## PREPARATION DU MESSAGE POUR LA GUILDE (_SEND2GUILDE.sh cut for long messages)
     if [[ ${message} != "${guilde}" && ${message} != "" ]]; then
         echo "[${guilde}] ${message}" > /tmp/sms_${guilde}
-        ${MY_PATH}/_SEND2GUILDE.sh "${guilde}" ## BUG CAN MAKE COLISION ;)
+        ${MY_PATH}/_SEND2GUILDE.sh "${guilde}" ## Prepare /GUILDES/${guilde} tosend.sh files ;)
     fi
 
     echo "ADMIN GUILDE [${xzuid}/${SCORE}/${guilde}] ${message}"
diff --git a/sms_received.sh b/sms_received.sh
index ab66e3d..b8a399b 100755
--- a/sms_received.sh
+++ b/sms_received.sh
@@ -5,6 +5,7 @@
 # License: GPL (http://www.google.com/search?q=GPL)
 ########################################################################
 ## PUT YOUR PHONE COUNTRY CODE PREFIX HERE
+## only works for station local country phone numbers!
 prefix="+33"
 ########################################################################
 MY_PATH="`dirname \"$0\"`"              # relative
@@ -31,6 +32,7 @@ ping -q -w 1 -c 1 taurus.copylaradio.com 2>&1>/dev/null && echo "TAURUS OK" && T
 
 ########################################################################
 # GET INCOMING SMS CONTENT
+# https://docs.gammu.org/smsd/run.html#environment
 ########################################################################
 ########################################################################
 PHONE="$SMS_1_NUMBER" # gammu-smsd 
@@ -41,7 +43,7 @@ PHONE="$SMS_1_NUMBER" # gammu-smsd
 [[ ${PHONE#"$prefix"} != "${PHONE}" ]] && phone=0${PHONE#"$prefix"} || phone="${PHONE}" 
 
 TEXT=""
-rm -f /tmp/sms_incoming
+rm -f /tmp/sms_incoming 2>/dev/null
 PROGRAM=/bin/echo
 for i in `seq $SMS_MESSAGES` ; do
     eval "$PROGRAM \"\${SMS_${i}_TEXT}\"" >> /tmp/sms_incoming
@@ -92,13 +94,13 @@ case "$CMD" in
 		;;
 	AIDE)
         ## ASK FOR HELP
-		$MY_PATH/sms/AIDE.sh "$phone" &
+		$MY_PATH/sms/AIDE.sh "$phone" && exit 0
 		;;
 
 	STOP)
         ## STOP RELATION WITH CMD GUILDE GROUP
         GUILDE=$(echo "$TEXT" | awk '{print toupper($2)}')
-		$MY_PATH/sms/ERASE.sh "$phone" "$GUILDE" &
+		$MY_PATH/sms/ERASE.sh "$phone" "$GUILDE" && exit 0
 		;;
 
     *)
@@ -108,9 +110,10 @@ case "$CMD" in
             echo "${MESSAGE}" > /tmp/${phone}_message
             echo "${MESSAGE}"
         fi
-        ## OK CMD=GROUPE suivi de message
+        ## CMD = GUILDE ?
         IsItAGuide=$(ls /home/${YOU}/.zen/SMS/GUILDES/*/INPUT/*_${phone}_guide.txt 2>/dev/null)
         [[ ${phone} != $SMSADMIN ]] && [[ ! $IsItAGuide ]] && [[ ! -d /home/${YOU}/.zen/SMS/GUILDES/${CMD} ]] && echo "AUCUNE GUILDE ${CMD} - EXIT -" && exit 0
+
         $MY_PATH/sms/GUILDE.sh "$phone" "$CMD" > /home/${YOU}/.zen/SMS/debug.log
         cat /home/${YOU}/.zen/SMS/debug.log
 		;;