diff --git a/biosms.sh b/biosms.sh index e5dc887..e608e7a 100755 --- a/biosms.sh +++ b/biosms.sh @@ -9,4 +9,7 @@ MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized ME="${0##*/}" echo "EXECUTE $ME ($1, $2)" -echo "Expédition SMS bio-dynamie.org (cron daily)" +echo "Expédition SMS aux GROUPES et PHONE" + +# SEARCH FOR /home/${YOU}/.zen/SMS/PHONE/${phonehash}/${ts}.tosend.sh + diff --git a/printQR_oasis_MODEL.sh b/printQR_oasis_MODEL.sh new file mode 100755 index 0000000..ececa5b --- /dev/null +++ b/printQR_oasis_MODEL.sh @@ -0,0 +1,9 @@ +#!/bin/bash +MY_PATH="`dirname \"$0\"`" # relative +MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized + +MODEL="$1" +[[ ! $MODEL ]] && MODEL = "MIZ" + +brother_ql_create --model QL-700 ${MY_PATH}/img/QR_oasis_${MODEL}.png --label-size 62 > /tmp/QR_oasis_${MODEL}.bin +brother_ql_print /tmp/QR_oasis_${MODEL}.bin /dev/usb/lp0 diff --git a/printQR_oasis_saubole.sh b/printQR_oasis_saubole.sh deleted file mode 100755 index a78eb9f..0000000 --- a/printQR_oasis_saubole.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -MY_PATH="`dirname \"$0\"`" # relative -MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized -brother_ql_create --model QL-700 ${MY_PATH}/img/QR_oasis_saubole.png --label-size 62 > /tmp/QR_oasis_saubole.bin -brother_ql_print /tmp/QR_oasis_saubole.bin /dev/usb/lp0 diff --git a/sms/GUILDE.sh b/sms/GUILDE.sh index 9e762db..e55813f 100755 --- a/sms/GUILDE.sh +++ b/sms/GUILDE.sh @@ -93,7 +93,7 @@ if [[ ! $xzuid ]]; then ######################################################################## echo "## REGISTER Nextcloud : ${xzuid} / ${phone} " ######################################################################## - sudo su -s /bin/sh www-data -c "export OC_PASS=\"${phone}\" && php /var/www/nextcloud/occ user:add --password-from-env --group=\"saubole\" --display-name=\"${xzuid}\" ${xzuid}" + sudo su -s /bin/sh www-data -c "export OC_PASS=\"${phone}\" && php /var/www/nextcloud/occ user:add --password-from-env --group=\"${groupe}\" --display-name=\"${xzuid}\" ${xzuid}" fi ######################################################################## @@ -115,19 +115,23 @@ else fi ######################################################################## -echo "## GESTION MESSAGE VERS ${groupe}" +echo "## GESTION MESSAGE PHONE VERS GUILDE : ${groupe}" ######################################################################## -mkdir -p /home/${YOU}/.zen/SMS/SAUBOLE/${groupe} -## WRITE AVIS FOR GROUPE -echo "${phone};${avis}" >> /home/${YOU}/.zen/SMS/SAUBOLE/${groupe}/AVIS +mkdir -p /home/${YOU}/.zen/SMS/GUILDES/${groupe}/INPUT/ + +## Ajout à la liste "avis" de PHONE à la GUILDE +echo "${avis}" >> /home/${YOU}/.zen/SMS/GUILDES/${groupe}/INPUT/${phone} +## Ajout à la liste "guildes" de PHONE +echo "${groupe}" >> /home/${YOU}/.zen/SMS/PHONE/${phonehash}/guildes ######################################################################## -## gammu-smsd HACK (must be stop to send response sms) +## BUG: gammu-smsd HACK (must be stop to send response sms) +## Création de script d'envoi de SMS après gammu-smsd stop ######################################################################## ts=$(date -u +%s%N | cut -b1-13) echo "#!/bin/bash -sudo gammu sendsms TEXT \"$phone\" -text \"Message pour ${groupe} bien reçu.\"" >> /home/${YOU}/.zen/SMS/${ts}.tosend.sh -chmod 775 /home/${YOU}/.zen/SMS/${ts}.tosend.sh +sudo gammu sendsms TEXT \"$phone\" -text \"Message pour ${groupe} bien reçu.\"" > /home/${YOU}/.zen/SMS/PHONE/${phonehash}/${ts}.tosend.sh +chmod 775 /home/${YOU}/.zen/SMS/PHONE/${phonehash}/${ts}.tosend.sh ######################################################################## ## PRINT ID + MESSAGE diff --git a/sms/QR_oasis_ARTISTES.png b/sms/QR_oasis_ARTISTES.png new file mode 100644 index 0000000..0654ded Binary files /dev/null and b/sms/QR_oasis_ARTISTES.png differ diff --git a/sms/QR_oasis_BACHET.png b/sms/QR_oasis_BACHET.png new file mode 100644 index 0000000..1463c04 Binary files /dev/null and b/sms/QR_oasis_BACHET.png differ diff --git a/sms/QR_oasis_CIRQUE.png b/sms/QR_oasis_CIRQUE.png new file mode 100644 index 0000000..896977c Binary files /dev/null and b/sms/QR_oasis_CIRQUE.png differ diff --git a/sms/QR_oasis_DOUMCELLO.png b/sms/QR_oasis_DOUMCELLO.png new file mode 100644 index 0000000..9025aa5 Binary files /dev/null and b/sms/QR_oasis_DOUMCELLO.png differ diff --git a/sms/QR_oasis_HELENE.png b/sms/QR_oasis_HELENE.png new file mode 100644 index 0000000..5da1020 Binary files /dev/null and b/sms/QR_oasis_HELENE.png differ diff --git a/sms/QR_oasis_MIZ.png b/sms/QR_oasis_MIZ.png new file mode 100644 index 0000000..030b4b8 Binary files /dev/null and b/sms/QR_oasis_MIZ.png differ diff --git a/sms/QR_oasis_ODETTE.png b/sms/QR_oasis_ODETTE.png new file mode 100644 index 0000000..8799255 Binary files /dev/null and b/sms/QR_oasis_ODETTE.png differ diff --git a/sms/QR_oasis_SAUBOLE.png b/sms/QR_oasis_SAUBOLE.png new file mode 100644 index 0000000..a5b7bd6 Binary files /dev/null and b/sms/QR_oasis_SAUBOLE.png differ diff --git a/sms/QR_oasis_TREAPHOP.png b/sms/QR_oasis_TREAPHOP.png new file mode 100644 index 0000000..ee1f4be Binary files /dev/null and b/sms/QR_oasis_TREAPHOP.png differ diff --git a/sms/QR_oasis_WAAWACH.png b/sms/QR_oasis_WAAWACH.png new file mode 100644 index 0000000..d9d6b14 Binary files /dev/null and b/sms/QR_oasis_WAAWACH.png differ diff --git a/sms/prepare_sms_tosend.sh b/sms/prepare_sms_tosend.sh new file mode 100644 index 0000000..6b8f3a2 --- /dev/null +++ b/sms/prepare_sms_tosend.sh @@ -0,0 +1,11 @@ +#!/bin/bash +# CREATE PHONE TOSEND MESSAGE +phone="$1" +phonehash=$(echo $phone | sha256sum | cut -d ' ' -f1) +message="$2" +groupe="$3" + +ts=$(date -u +%s%N | cut -b1-13) +echo "#!/bin/bash +sudo gammu sendsms TEXT \"${phone}\" -text \"${message}\"" > /home/${YOU}/.zen/SMS/PHONE/${phonehash}/${ts}.tosend.sh +chmod 775 /home/${YOU}/.zen/SMS/PHONE/${phonehash}/${ts}.tosend.sh