diff --git a/sms/ERASE.sh b/sms/ERASE.sh index eaed87a..de45777 100755 --- a/sms/ERASE.sh +++ b/sms/ERASE.sh @@ -21,8 +21,8 @@ G1PUB=$(cat /home/${YOU}/.zen/secret.dunikey | grep 'pub:' | cut -d ' ' -f 2) ## TEST PHONE ######################################################################## phonehash=$(echo $phone | sha256sum | cut -d ' ' -f1) -htest=$(ls /home/${YOU}/.zen/SMS/PHONE/${phonehash} 2>/dev/null) -if [[ $htest ]]; then + +if [[ -d /home/${YOU}/.zen/SMS/PHONE/${phonehash} ]]; then NEW=0 xzuid=$(cat "/home/${YOU}/.zen/SMS/PHONE/${phonehash}/xzuid.txt" 2>/dev/null) [[ ! $xzuid ]] && xzuid=$(cat "/home/${YOU}/.zen/SMS/PHONE/${phonehash}/xzuid") @@ -56,17 +56,20 @@ if [[ "${guilde}" == "MIZ" ]]; then echo "## DELETE NEXTCLOUD : $xzuid" sudo su -s /bin/sh www-data -c "export OC_PASS=\"$phone\" && php /var/www/nextcloud/occ user:delete $xzuid" [[ ! $? == 0 ]] && echo "FAILED" && exit 1 + rm -f /home/${YOU}/.zen/SMS/PHONE/${phonehash}/GUILDES/NEXTCLOUD fi echo "## DELETE GCHANGE : $xzuid" $MY_PATH/jaklis/jaklis.py -k /home/${YOU}/.zen/SMS/ERASE/${xzuid}_${phone}.dunikey -n "https://data.gchange.fr" erase [[ ! $? == 0 ]] && echo "FAILED" && exit 1 + rm -f /home/${YOU}/.zen/SMS/PHONE/${phonehash}/GUILDES/GCHANGE echo "## DELETE CESIUM : $xzuid" $MY_PATH/jaklis/jaklis.py -k /home/${YOU}/.zen/SMS/ERASE/${xzuid}_${phone}.dunikey -n "https://g1.data.e-is.pro" erase [[ ! $? == 0 ]] && echo "FAILED" && exit 1 + rm -f /home/${YOU}/.zen/SMS/PHONE/${phonehash}/GUILDES/CESIUM - rm -Rf /home/${YOU}/.zen/SMS/PHONE/${phonehash}/ + rm -Rf /home/${YOU}/.zen/SMS/PHONE/${phonehash} fi ######################################################################## @@ -75,6 +78,7 @@ if [[ "${guilde}" == "NEXTCLOUD" ]]; then if [[ -f /var/www/nextcloud/occ ]]; then sudo su -s /bin/sh www-data -c "export OC_PASS=\"$phone\" && php /var/www/nextcloud/occ user:delete $xzuid" [[ ! $? == 0 ]] && echo "FAILED" && exit 1 + rm -f /home/${YOU}/.zen/SMS/PHONE/${phonehash}/GUILDES/NEXTCLOUD fi fi ######################################################################## @@ -83,6 +87,7 @@ fi if [[ "${guilde}" == "GCHANGE" ]]; then $MY_PATH/jaklis/jaklis.py -k /home/${YOU}/.zen/SMS/ERASE/${xzuid}_${phone}.dunikey -n "https://data.gchange.fr" erase [[ ! $? == 0 ]] && echo "FAILED" && exit 1 + rm -f /home/${YOU}/.zen/SMS/PHONE/${phonehash}/GUILDES/GCHANGE fi ######################################################################## @@ -90,6 +95,7 @@ fi if [[ "${guilde}" == "CESIUM" ]]; then $MY_PATH/jaklis/jaklis.py -k /home/${YOU}/.zen/SMS/ERASE/${xzuid}_${phone}.dunikey -n "https://g1.data.e-is.pro" erase [[ ! $? == 0 ]] && echo "FAILED" && exit 1 + rm -f /home/${YOU}/.zen/SMS/PHONE/${phonehash}/GUILDES/CESIUM fi ######################################################################## diff --git a/sms/GUILDE.sh b/sms/GUILDE.sh index 51a15e2..f01f233 100755 --- a/sms/GUILDE.sh +++ b/sms/GUILDE.sh @@ -69,6 +69,7 @@ sudo gammu sendsms TEXT \"_PHONE_\" -text \"Heureux de vous accueillir. $xzuid e ######################################################################## echo "## MAKE secret.dunikey" ######################################################################## + sudo rm /tmp/secret.dunikey $MY_PATH/key_create_dunikey.py "$xzuid" "$phone" [[ ! $? == 0 ]] && echo "FAILED" && exit 1 g1pub=$(cat /tmp/secret.dunikey | grep "pub" | cut -d ' ' -f 2)