From 1331c70039c1e7df0910afe07a95c0566f73c6b1 Mon Sep 17 00:00:00 2001 From: qo-op Date: Thu, 8 Jul 2021 22:32:29 +0200 Subject: [PATCH] 2>/dev/null --- sms/GUILDE.sh | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/sms/GUILDE.sh b/sms/GUILDE.sh index c0b31d9..f9f0da7 100755 --- a/sms/GUILDE.sh +++ b/sms/GUILDE.sh @@ -71,7 +71,7 @@ sudo gammu sendsms TEXT \"_PHONE_\" -text \"Heureux de vous accueillir. $xzuid e ######################################################################## echo "## MAKE secret.dunikey" ######################################################################## - sudo rm /tmp/secret.dunikey + sudo rm /tmp/secret.dunikey 2>/dev/null $MY_PATH/key_create_dunikey.py "$xzuid" "$phone" [[ ! $? == 0 ]] && echo "FAILED" && exit 1 g1pub=$(cat /tmp/secret.dunikey | grep "pub" | cut -d ' ' -f 2) @@ -219,7 +219,7 @@ if [[ -d /home/${YOU}/.zen/SMS/GUILDES/${guilde}/INPUT ]]; then ln -s /home/${YOU}/.zen/SMS/GUILDES/${guilde} /home/${YOU}/.zen/SMS/PHONE/${phonehash}/GUILDES/${guilde} ## LIEN vers PHONE/${phonehash} dans GUILDES/${guilde}/MEMBERS/ - mkdir -p mkdir -p /home/${YOU}/.zen/SMS/GUILDES/${guilde}/MEMBERS/ + mkdir -p /home/${YOU}/.zen/SMS/GUILDES/${guilde}/MEMBERS/ ln -s /home/${YOU}/.zen/SMS/PHONE/${phonehash} /home/${YOU}/.zen/SMS/GUILDES/${guilde}/MEMBERS/${phone} ## CREATION /MadeInZion/${guilde}/${xzuid} dans NEXTCLOUD @@ -285,9 +285,11 @@ if [[ $NEW == 1 ]]; then fi # PRINT QRSEC.png - brother_ql_create --model QL-700 /home/${YOU}/.zen/SMS/PHONE/${phonehash}/QRSEC.png --label-size 62 > /tmp/${ts}_QRSEC.bin - brother_ql_print /tmp/${ts}_QRSEC.bin /dev/usb/lp0; rm /tmp/${ts}_QRSEC.bin - sudo cp /home/${YOU}/.zen/SMS/PHONE/${phonehash}/QRSEC.png /var/www/nextcloud/data/${xzuid}/files/MadeInZion/ + if [[ -e /dev/usb/lp0 ]]; then + brother_ql_create --model QL-700 /home/${YOU}/.zen/SMS/PHONE/${phonehash}/QRSEC.png --label-size 62 > /tmp/${ts}_QRSEC.bin + brother_ql_print /tmp/${ts}_QRSEC.bin /dev/usb/lp0; rm /tmp/${ts}_QRSEC.bin + sudo cp /home/${YOU}/.zen/SMS/PHONE/${phonehash}/QRSEC.png /var/www/nextcloud/data/${xzuid}/files/MadeInZion/ + fi # PRINT $PASS convert -background White label:"CODE SECRET : ${PASS} " -append /tmp/${ts}_PASS.png @@ -296,20 +298,21 @@ if [[ $NEW == 1 ]]; then brother_ql_print /tmp/${ts}_PASS.bin /dev/usb/lp0 rm /tmp/${ts}_PASS.bin /tmp/${ts}_PASS.png else - sudo cp /tmp/${ts}_PASS.png /var/www/nextcloud/data/${xzuid}/files/MadeInZion/${PASS}_PASS.png + sudo cp /tmp/${ts}_PASS.png /var/www/nextcloud/data/${xzuid}/files/MadeInZion/PASS.png fi else ## PUT DATA IN NEXTCLOUD FOLDER - sudo cp ../img/MadeInZion_G1_ASTROPORT.png /var/www/nextcloud/data/${xzuid}/files/MadeInZion/ - sudo cp /home/${YOU}/.zen/SMS/PHONE/${phonehash}/avatar.jpg /var/www/nextcloud/data/${xzuid}/files/MadeInZion/ - sudo cp /home/${YOU}/.zen/SMS/PHONE/${phonehash}/QR.png /var/www/nextcloud/data/${xzuid}/files/MadeInZion/QR_${G1}.png - sudo cp /home/${YOU}/.zen/SMS/PHONE/${phonehash}/QRSEC.png /var/www/nextcloud/data/${xzuid}/files/MadeInZion/QRSEC_${G1}.png - convert -background White label:"${xzuid} ${phone}" -append /tmp/${ts}_ID.png - sudo cp /tmp/${ts}_ID.png /var/www/nextcloud/data/${xzuid}/files/MadeInZion/ID_${G1}.png - - sudo chmod 775 /var/www/nextcloud/data/${xzuid}/files/MadeInZion - sudo chown -R www-data:${YOU} /var/www/nextcloud/data/${xzuid}/files/MadeInZion + sudo cp ../img/MadeInZion_G1_ASTROPORT.png /var/www/nextcloud/data/${xzuid}/files/MadeInZion/ 2>/dev/null + sudo cp /home/${YOU}/.zen/SMS/PHONE/${phonehash}/avatar.jpg /var/www/nextcloud/data/${xzuid}/files/MadeInZion/ 2>/dev/null + sudo cp /home/${YOU}/.zen/SMS/PHONE/${phonehash}/QR.png /var/www/nextcloud/data/${xzuid}/files/MadeInZion/QR_${G1}.png 2>/dev/null + sudo cp /home/${YOU}/.zen/SMS/PHONE/${phonehash}/QRSEC.png /var/www/nextcloud/data/${xzuid}/files/MadeInZion/QRSEC_${G1}.png 2>/dev/null + convert -background White label:"${xzuid} ${phone}" -append /tmp/${ts}_ID.png 2>/dev/null + sudo cp /tmp/${ts}_ID.png /var/www/nextcloud/data/${xzuid}/files/MadeInZion/ID_${G1}.png 2>/dev/null + convert -background White label:"CODE SECRET : ${PASS} " -append /tmp/${ts}_PASS.png 2>/dev/null + sudo cp /tmp/${ts}_PASS.png /var/www/nextcloud/data/${xzuid}/files/MadeInZion/PASS.png 2>/dev/null + sudo chmod 775 /var/www/nextcloud/data/${xzuid}/files/MadeInZion 2>/dev/null + sudo chown -R www-data:${YOU} /var/www/nextcloud/data/${xzuid}/files/MadeInZion 2>/dev/null fi