avoid duplicate

This commit is contained in:
qo-op 2021-07-08 02:12:40 +02:00
parent 7a875108d0
commit 7eb72fb0ae
1 changed files with 6 additions and 5 deletions

View File

@ -51,7 +51,7 @@ if [[ ! $xzuid ]]; then
## MAKE UNIQ xzuid ## MAKE UNIQ xzuid
xzuid=$($MY_PATH/diceware.sh 1 | xargs)${RANDOM:0:5} xzuid=$($MY_PATH/diceware.sh 1 | xargs)${RANDOM:0:5}
while [[ "$(cat /home/${YOU}/.zen/SMS/PHONE/*/xzuid.txt)" == "${xzuid}" ]] while [[ "$(cat /home/${YOU}/.zen/SMS/PHONE/*/xzuid.txt 2>/dev/null)" == "${xzuid}" ]]
do do
xzuid=$($MY_PATH/diceware.sh 1 | xargs)${RANDOM:0:5} xzuid=$($MY_PATH/diceware.sh 1 | xargs)${RANDOM:0:5}
done done
@ -77,7 +77,7 @@ sudo gammu sendsms TEXT \"_PHONE_\" -text \"Heureux de vous accueillir. $xzuid e
echo $g1pub > /home/${YOU}/.zen/SMS/PHONE/${phonehash}/g1pub.txt echo $g1pub > /home/${YOU}/.zen/SMS/PHONE/${phonehash}/g1pub.txt
G1=$(cat /home/${YOU}/.zen/SMS/PHONE/${phonehash}/g1pub.txt) G1=$(cat /home/${YOU}/.zen/SMS/PHONE/${phonehash}/g1pub.txt)
my_guildes="MIZ;$my_guildes" [[ "$my_guildes" != "MIZ" ]] && my_guildes="MIZ;$my_guildes"
######################################################################## ########################################################################
echo "## MAKING QRCODES FOR $G1" echo "## MAKING QRCODES FOR $G1"
@ -145,6 +145,7 @@ sudo gammu sendsms TEXT \"_PHONE_\" -text \"Heureux de vous accueillir. $xzuid e
[[ $? == 0 ]] && my_guildes="NEXTCLOUD;$my_guildes" && mkdir -p /home/${YOU}/.zen/SMS/GUILDES/NEXTCLOUD/INPUT [[ $? == 0 ]] && my_guildes="NEXTCLOUD;$my_guildes" && mkdir -p /home/${YOU}/.zen/SMS/GUILDES/NEXTCLOUD/INPUT
fi fi
echo "=> $xzuid/$phone PASS=$PASS G1=$G1"
else else
@ -152,7 +153,7 @@ else
PASS=$(cat /tmp/${phonehash}.pin) && rm /tmp/${phonehash}.pin PASS=$(cat /tmp/${phonehash}.pin) && rm /tmp/${phonehash}.pin
G1=$(cat /home/${YOU}/.zen/SMS/PHONE/${phonehash}/g1pub.txt) G1=$(cat /home/${YOU}/.zen/SMS/PHONE/${phonehash}/g1pub.txt)
$MY_PATH/natools.py decrypt -f pubsec -k "/home/${YOU}/.zen/secret.dunikey" -i "/home/${YOU}/.zen/SMS/PHONE/${phonehash}/secret.dunikey.encrypt" -o "/tmp/secret.dunikey" $MY_PATH/natools.py decrypt -f pubsec -k "/home/${YOU}/.zen/secret.dunikey" -i "/home/${YOU}/.zen/SMS/PHONE/${phonehash}/secret.dunikey.encrypt" -o "/tmp/secret.dunikey"
echo "=> $xzuid DEJA INSCRIT PASS=$PASS G1=$G1" echo "=> $xzuid/$phone DEJA INSCRIT PASS=$PASS G1=$G1"
fi fi
@ -161,7 +162,7 @@ echo "## INSCRIPTION PHONE / GUILDE : ${phone} / ${guilde}"
######################################################################## ########################################################################
## NOUVELLE INSCRIPTION GUILDE (pas encore de lien INPUT/${phone}) ## NOUVELLE INSCRIPTION GUILDE (pas encore de lien INPUT/${phone})
[[ ! -f /home/${YOU}/.zen/SMS/GUILDES/${guilde}/INPUT/${phone} ]] && echo "#!/bin/bash [[ ! -f /home/${YOU}/.zen/SMS/GUILDES/${guilde}/INPUT/${phone} ]] && echo "#!/bin/bash
sudo gammu sendsms TEXT \"_PHONE_\" -text \"${xzuid}, bienvenue dans la guilde ${guilde}. Proposez, discutez des nouvelles missions sur https://oasis.astroport.com ?\"" > /home/${YOU}/.zen/SMS/PHONE/${phonehash}/0000000000000.tosend.sh sudo gammu sendsms TEXT \"_PHONE_\" -text \"${xzuid}, bienvenue dans la guilde ${guilde}. Venez proposer vos actions, discutez sur https://oasis.astroport.com ?\"" > /home/${YOU}/.zen/SMS/PHONE/${phonehash}/0000000000000.tosend.sh
######################################################################## ########################################################################
## COMBIEN D'ETOILES GCHANGE ?? ADMIN ## COMBIEN D'ETOILES GCHANGE ?? ADMIN
@ -220,7 +221,7 @@ if [[ -d /home/${YOU}/.zen/SMS/GUILDES/${guilde}/INPUT ]]; then
## CONFIRMATION SMS : INSCRIPTION A LA GUILDE ## CONFIRMATION SMS : INSCRIPTION A LA GUILDE
echo "#!/bin/bash echo "#!/bin/bash
sudo gammu sendsms TEXT \"_PHONE_\" -text \"Activation de votre inscription à la guilde : ${guilde}. Gagnez des primes! Inventez, relevez des missions...\"" > /home/${YOU}/.zen/SMS/PHONE/${phonehash}/$(date -u +%s%N | cut -b1-13).tosend.sh sudo gammu sendsms TEXT \"_PHONE_\" -text \"Inscription à la guilde : ${guilde}\"" > /home/${YOU}/.zen/SMS/PHONE/${phonehash}/$(date -u +%s%N | cut -b1-13).tosend.sh
else else