From 652b5442e26cd8eb79a2dc662fc804f825e4ca59 Mon Sep 17 00:00:00 2001
From: qo-op <support@qo-op.com>
Date: Mon, 12 Jul 2021 20:53:10 +0200
Subject: [PATCH] sms/_SEND2GUILDE.sh

---
 scrapers/org.bio-dynamie.sh         | 34 ++++++++++++++---------------
 sms/GUILDE.sh                       | 11 +++++-----
 sms/{_BIODYN.sh => _SEND2GUILDE.sh} | 21 +++++++++---------
 3 files changed, 33 insertions(+), 33 deletions(-)
 rename sms/{_BIODYN.sh => _SEND2GUILDE.sh} (74%)

diff --git a/scrapers/org.bio-dynamie.sh b/scrapers/org.bio-dynamie.sh
index 6f1c0e5..bc91d33 100755
--- a/scrapers/org.bio-dynamie.sh
+++ b/scrapers/org.bio-dynamie.sh
@@ -48,8 +48,8 @@ if [[ "$DAY" == "Lundi" ]]; then
 	echo "LUNDI"
 	LUNDI=$(cat /tmp/index.html | awk '/Lundi/{s=x}{s=s$0"\n"}/Mardi/{print s}' | html2text -utf8 | awk -F "$TOM/" '{print $1}')
 	echo "$LUNDI" > /tmp/buffer
-	[[ $S == "1" ]] && tr '\n' ' ' < /tmp/buffer | awk -F "$ND" '{print $1}' > /tmp/sms 
-	[[ $S == "2" ]] && tr '\n' ' ' < /tmp/buffer | awk -F "$ND" '{print $2}' > /tmp/sms
+	[[ $S == "1" ]] && tr '\n' ' ' < /tmp/buffer | awk -F "$ND" '{print $1}' > /tmp/sms_BIODYN 
+	[[ $S == "2" ]] && tr '\n' ' ' < /tmp/buffer | awk -F "$ND" '{print $2}' > /tmp/sms_BIODYN
 fi
 
 #read
@@ -57,8 +57,8 @@ if [[ "$DAY" == "Mardi" ]]; then
 	echo "MARDI"
 	MARDI=$(cat /tmp/index.html | awk '/Mardi/{s=x}{s=s$0"\n"}/Mercredi/{print s}' | html2text -utf8 | awk -F "$TOM/" '{print $1}')
 	echo "$MARDI" > /tmp/buffer
-	[[ $S == "1" ]] && tr '\n' ' ' < /tmp/buffer | awk -F "$ND" '{print $1}' > /tmp/sms 
-	[[ $S == "2" ]] && tr '\n' ' ' < /tmp/buffer | awk -F "$ND" '{print $2}' > /tmp/sms
+	[[ $S == "1" ]] && tr '\n' ' ' < /tmp/buffer | awk -F "$ND" '{print $1}' > /tmp/sms_BIODYN 
+	[[ $S == "2" ]] && tr '\n' ' ' < /tmp/buffer | awk -F "$ND" '{print $2}' > /tmp/sms_BIODYN
 fi
 
 #read
@@ -66,8 +66,8 @@ if [[ "$DAY" == "Mercredi" ]]; then
 	echo "MERCREDI"
 	MERCREDI=$(cat /tmp/index.html | awk '/Mercredi/{s=x}{s=s$0"\n"}/Jeudi/{print s}' | html2text -utf8 | awk -F "$TOM/" '{print $1}')
 	echo "$MERCREDI" > /tmp/buffer
-	[[ $S == "1" ]] && tr '\n' ' ' < /tmp/buffer | awk -F "$ND" '{print $1}' > /tmp/sms 
-	[[ $S == "2" ]] && tr '\n' ' ' < /tmp/buffer | awk -F "$ND" '{print $2}' > /tmp/sms
+	[[ $S == "1" ]] && tr '\n' ' ' < /tmp/buffer | awk -F "$ND" '{print $1}' > /tmp/sms_BIODYN 
+	[[ $S == "2" ]] && tr '\n' ' ' < /tmp/buffer | awk -F "$ND" '{print $2}' > /tmp/sms_BIODYN
 fi
 
 #read
@@ -75,8 +75,8 @@ if [[ "$DAY" == "Jeudi" ]]; then
 	echo "JEUDI"
 	JEUDI=$(cat /tmp/index.html | awk '/Jeudi/{s=x}{s=s$0"\n"}/Vendredi/{print s}' | html2text -utf8 | awk -F "$TOM/" '{print $1}')
 	echo "$JEUDI" > /tmp/buffer
-	[[ $S == "1" ]] && tr '\n' ' ' < /tmp/buffer | awk -F "$ND" '{print $1}' > /tmp/sms 
-	[[ $S == "2" ]] && tr '\n' ' ' < /tmp/buffer | awk -F "$ND" '{print $2}' > /tmp/sms
+	[[ $S == "1" ]] && tr '\n' ' ' < /tmp/buffer | awk -F "$ND" '{print $1}' > /tmp/sms_BIODYN 
+	[[ $S == "2" ]] && tr '\n' ' ' < /tmp/buffer | awk -F "$ND" '{print $2}' > /tmp/sms_BIODYN
 fi
 
 #read
@@ -84,8 +84,8 @@ if [[ "$DAY" == "Vendredi" ]]; then
 	echo "VENDREDI"
 	VENDREDI=$(cat /tmp/index.html | awk '/ Vendredi/{s=x}{s=s$0"\n"}/ Samedi/{print s}' | html2text -utf8 | awk -F "$TOM/" '{print $1}')
 	echo "$VENDREDI" > /tmp/buffer
-	[[ $S == "1" ]] && tr '\n' ' ' < /tmp/buffer | awk -F "$ND" '{print $1}' > /tmp/sms 
-	[[ $S == "2" ]] && tr '\n' ' ' < /tmp/buffer | awk -F "$ND" '{print $2}' > /tmp/sms
+	[[ $S == "1" ]] && tr '\n' ' ' < /tmp/buffer | awk -F "$ND" '{print $1}' > /tmp/sms_BIODYN 
+	[[ $S == "2" ]] && tr '\n' ' ' < /tmp/buffer | awk -F "$ND" '{print $2}' > /tmp/sms_BIODYN
 fi 
 
 #read
@@ -93,8 +93,8 @@ if [[ "$DAY" == "Samedi" ]]; then
 	echo "SAMEDI"
 	SAMEDI=$(cat /tmp/index.html | awk '/Samedi/{s=x}{s=s$0"\n"}/Dimanche/{print s}' | html2text -utf8 | awk -F "$TOM/" '{print $1}')
 	echo "$SAMEDI" > /tmp/buffer
-	[[ $S == "1" ]] && tr '\n' ' ' < /tmp/buffer | awk -F "$ND" '{print $1}' > /tmp/sms 
-	[[ $S == "2" ]] && tr '\n' ' ' < /tmp/buffer | awk -F "$ND" '{print $2}' > /tmp/sms
+	[[ $S == "1" ]] && tr '\n' ' ' < /tmp/buffer | awk -F "$ND" '{print $1}' > /tmp/sms_BIODYN 
+	[[ $S == "2" ]] && tr '\n' ' ' < /tmp/buffer | awk -F "$ND" '{print $2}' > /tmp/sms_BIODYN
 fi
 
 #read
@@ -102,21 +102,21 @@ if [[ "$DAY" == "Dimanche" ]]; then
 	echo "DIMANCHE"
 	DIMANCHE=$(cat /tmp/index.html | awk '/Dimanche/{s=x}{s=s$0"\n"}/#Lune/{print s}' | html2text -utf8 | awk -F "$TOM/" '{print $1}')
 	echo "$DIMANCHE" > /tmp/buffer
-	[[ $S == "1" ]] && tr '\n' ' ' < /tmp/buffer | awk -F '#' '{print $1}' > /tmp/sms 
-	[[ $S == "2" ]] && tr '\n' ' ' < /tmp/buffer | awk -F '#' '{print $2}' > /tmp/sms 
+	[[ $S == "1" ]] && tr '\n' ' ' < /tmp/buffer | awk -F '#' '{print $1}' > /tmp/sms_BIODYN 
+	[[ $S == "2" ]] && tr '\n' ' ' < /tmp/buffer | awk -F '#' '{print $2}' > /tmp/sms_BIODYN 
 fi 
 
 if [[ "$DAY" == "Lundi" ]]; then
 	echo "__________LUNE__________"
 	LUNE=$(cat /tmp/index.html | awk '/#Lune/{s=x}{s=s$0"\n"}/\.#/{print s}' | html2text -utf8 | awk -F 'Lundi' '{print $1}')
 	echo "$LUNE" >> /tmp/buffer
-	[[ $S == "1" ]] && tr '\n' ' ' < /tmp/buffer | awk -F '#Lune' '{print $2}' >> /tmp/sms 
-	[[ $S == "2" ]] && tr '\n' ' ' < /tmp/buffer | awk -F '#Lune' '{print $3}' >> /tmp/sms 
+	[[ $S == "1" ]] && tr '\n' ' ' < /tmp/buffer | awk -F '#Lune' '{print $2}' >> /tmp/sms_BIODYN 
+	[[ $S == "2" ]] && tr '\n' ' ' < /tmp/buffer | awk -F '#Lune' '{print $3}' >> /tmp/sms_BIODYN 
 fi
 
 echo "##################################################################"
 echo "SMS"
 echo "##################################################################"
-cat /tmp/sms
+cat /tmp/sms_BIODYN
 echo "##################################################################"
 exit 0
diff --git a/sms/GUILDE.sh b/sms/GUILDE.sh
index bc07d45..96f4e32 100755
--- a/sms/GUILDE.sh
+++ b/sms/GUILDE.sh
@@ -164,8 +164,8 @@ fi
 echo "## INSCRIPTION PHONE / GUILDE : ${phone} / ${guilde}"
 ########################################################################
 ## NOUVELLE INSCRIPTION GUILDE (pas encore de lien INPUT/${phone})
-[[ ! -f /home/${YOU}/.zen/SMS/GUILDES/${guilde}/INPUT/${phone} ]] && echo "#!/bin/bash
-sudo gammu sendsms TEXT \"_PHONE_\" -text \"${xzuid}, bienvenue dans la guilde ${guilde} en action pour un nouveau monde  https://oasis.astroport.com\"" > /home/${YOU}/.zen/SMS/PHONE/${phonehash}/0000000000000.tosend.sh
+[[ ! -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
 
 ########################################################################
 ## COMBIEN D'ETOILES GCHANGE ?? ADMIN
@@ -185,9 +185,10 @@ if [[ $SCORE -ge 4 || ${phone} == $SMSADMIN ]]; then
     mkdir -p /home/${YOU}/.zen/SMS/GUILDES/${guilde}/OUTPUT/
 
     ## PREPARATION DU MESSAGE POUR LA GUILDE (cut for long messages)
-    [[ ${message} != "${guilde}" && ${message} != "" ]] && echo "[${guilde}] ${message}" > /tmp/sms && ${MY_PATH}/_BIODYN.sh "${guilde}" ## BUG CAN MAKE COLISION ;)
-#    echo "#!/bin/bash
-#sudo gammu sendsms TEXT \"_PHONE_\" -text \"[${guilde}] ${message}\"" > /home/${YOU}/.zen/SMS/GUILDES/${guilde}/OUTPUT/$(date -u +%s%N | cut -b1-13).tosend.sh && chmod +x /home/${YOU}/.zen/SMS/GUILDES/${guilde}/OUTPUT/*.tosend.sh
+    if [[ ${message} != "${guilde}" && ${message} != "" ]]; then
+        echo "[${guilde}] ${message}" > /tmp/sms_${guilde}
+        ${MY_PATH}/_SEND2GUILDE.sh "${guilde}" ## BUG CAN MAKE COLISION ;)
+    fi
 
     echo "ADMIN GUILDE [${xzuid}/${SCORE}/${guilde}] ${message}"
     ## LIENS A LA GUILDE
diff --git a/sms/_BIODYN.sh b/sms/_SEND2GUILDE.sh
similarity index 74%
rename from sms/_BIODYN.sh
rename to sms/_SEND2GUILDE.sh
index a5c2b4f..1964b0a 100755
--- a/sms/_BIODYN.sh
+++ b/sms/_SEND2GUILDE.sh
@@ -8,31 +8,30 @@ MY_PATH="`dirname \"$0\"`"              # relative
 MY_PATH="`( cd \"$MY_PATH\" && pwd )`"  # absolutized and normalized
 
 ME="${0##*/}"
-echo "EXECUTE $ME ($1, $2)"
+echo "EXECUTE $ME ($1)"
 [[ "$1" == "" ]] && GUILDE="BIODYN" || GUILDE="$1"  ## DEFAULT GUILDE BIODYN
-
-echo "Expédition des SMS aux inscrits à la GUILDE $GUILDE"
+[[ "${GUILDE}" == "" || ! -d /home/${YOU}/.zen/SMS/GUILDES/${GUILDE} ]] && echo "AUCUNE GUILDE. EXIT." && exit 1
+echo "Expédition SMS /tmp/sms_${GUILDE} aux inscrits à la GUILDE $GUILDE"
 
 YOU=$(ps auxf --sort=+utime | grep -w ipfs | grep -v -E 'color=auto|grep' | tail -n 1 | cut -d " " -f 1) || er+=" ipfs daemon not running"
 [[ ! -f /home/${YOU}/.zen/secret.dunikey ]] && echo "Astroport Crypto is missing... please provide /home/${YOU}/.zen/secret.dunikey by installing 'astrXbian' TestNet" && exit 1
 G1PUB=$(cat /home/${YOU}/.zen/secret.dunikey | grep 'pub:' | cut -d ' ' -f 2)
 
-# PROCESS /tmp/sms to GUILDE cut in piece SMS
-[[ "$GUILDE" == "BIODYN" ]] && ${MY_PATH}/../scrapers/org.bio-dynamie.sh 
-if [[ $? != 0 ]]; then
-    echo "SITE INACCESSIBLE ?"
+# PROCESS /tmp/sms_${GUILDE} to GUILDE cut in piece SMS
+[[ "$GUILDE" == "BIODYN" ]] && ${MY_PATH}/../scrapers/org.bio-dynamie.sh
+
+if [[ ! -f /tmp/sms_${GUILDE} ]]; then
     echo "#!/bin/bash
-sudo gammu sendsms TEXT \"_PHONE_\" -text \"Site Web https://bio-dynamie.org inaccessible ce matin \"" > /home/${YOU}/.zen/SMS/GUILDES/${GUILDE}/OUTPUT/$(date -u +%s%N | cut -b1-13).tosend.sh
+sudo gammu sendsms TEXT \"_PHONE_\" -text \"Difficulté à récupérer les conseils du jour sur https://bio-dynamie.org \"" > /home/${YOU}/.zen/SMS/GUILDES/${GUILDE}/OUTPUT/$(date -u +%s%N | cut -b1-13).tosend.sh
 fi
 
-[[ "${GUILDE}" == "" || ! -d /home/${YOU}/.zen/SMS/GUILDES/${GUILDE} ]] && echo "AUCUNE GUILDE. EXIT." && exit 1
 [[ ! -d /home/${YOU}/.zen/SMS/GUILDES/${GUILDE}/OUTPUT/ ]] && mkdir -p /home/${YOU}/.zen/SMS/GUILDES/${GUILDE}/OUTPUT/
 
 ## PREPARE SMS OUTPUT FOR ${GUILDE} GUILDE
 num=1;
-max=$(fold -w 160 -s /tmp/sms | wc -l)
+max=$(fold -w 160 -s /tmp/sms_${GUILDE} | wc -l)
 max=$((max + 1));
-while line=$(fold -w 160 -s /tmp/sms | head -n $num | tail -n 1); do
+while line=$(fold -w 160 -s /tmp/sms_${GUILDE} | head -n $num | tail -n 1); do
     num=$((num + 1));
     echo $line;
     echo "#!/bin/bash