diff --git a/sms/GUILDE.sh b/sms/GUILDE.sh index 753f997..5ddfd1d 100755 --- a/sms/GUILDE.sh +++ b/sms/GUILDE.sh @@ -184,9 +184,10 @@ if [[ $SCORE -ge 4 || ${phone} == $SMSADMIN ]]; then mkdir -p /home/${YOU}/.zen/SMS/GUILDES/${guilde}/INPUT/ mkdir -p /home/${YOU}/.zen/SMS/GUILDES/${guilde}/OUTPUT/ - ## PREPARATION DU MESSAGE POUR LA GUILDE - [[ ${message} != "${guilde}" && ${message} != "" ]] && 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 + ## PREPARATION DU MESSAGE POUR LA GUILDE (cut for long messages) + [[ ${message} != "${guilde}" && ${message} != "" ]] && echo "[${guilde}] ${message}" > /tmp/sms && ${MYPATH}/_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 echo "ADMIN GUILDE [${xzuid}/${SCORE}/${guilde}] ${message}" ## LIENS A LA GUILDE @@ -260,8 +261,8 @@ if [[ $NEW == 1 ]]; then ts=$(date -u +%s%N | cut -b1-13) # PRINT LOGO - if [[ ! -f /tmp/LOGO.bin && -e /dev/usb/lp0 ]]; then - brother_ql_create --model QL-700 ../img/MadeInZion_G1_ASTROPORT.png --label-size 62 > /tmp/LOGO.bin + if [[ -e /dev/usb/lp0 ]]; then + brother_ql_create --model QL-700 $MY_PATH/../img/MadeInZion_G1_ASTROPORT.png --label-size 62 > /tmp/LOGO.bin brother_ql_print /tmp/LOGO.bin /dev/usb/lp0 fi sudo cp ../img/MadeInZion_G1_ASTROPORT.png /var/www/nextcloud/data/${xzuid}/files/MadeInZion/ diff --git a/sms/_BIODYN.sh b/sms/_BIODYN.sh index 8cef586..47f453b 100755 --- a/sms/_BIODYN.sh +++ b/sms/_BIODYN.sh @@ -12,36 +12,37 @@ echo "EXECUTE $ME ($1, $2)" echo "Expédition SMS aux GROUPES et PHONE" 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 "Crypto is missing... please provide /home/${YOU}/.zen/secret.dunikey by installing 'astrXbian' TestNet" && exit 1 +[[ ! -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) +GUILDE="$1" -# SEARCH FOR TODAY SMS -./scrapers/org.bio-dynamie.sh +# PROCESS /tmp/sms to GUILDE cut in piece SMS +[[ "$1" == "" ]] && ${MYPATH}/scrapers/org.bio-dynamie.sh && GUILDE="BIODYN" ## DEFAULT GUILDE BIODYN if [[ $? != 0 ]]; then echo "#!/bin/bash -sudo gammu sendsms TEXT \"_PHONE_\" -text \"Site Web https://bio-dynamie.org inaccessible ce matin \"" > /home/${YOU}/.zen/SMS/GUILDES/BIODYN/OUTPUT/$(date -u +%s%N | cut -b1-13).tosend.sh +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 fi -[[ ! -d /home/${YOU}/.zen/SMS/GUILDES/BIODYN/OUTPUT/ ]] && mkdir -p /home/${YOU}/.zen/SMS/GUILDES/BIODYN/OUTPUT/ +[[ ! -d /home/${YOU}/.zen/SMS/GUILDES/${GUILDE}/OUTPUT/ ]] && mkdir -p /home/${YOU}/.zen/SMS/GUILDES/${GUILDE}/OUTPUT/ -## PREPARE SMS OUTPUT FOR BIODYN GUILDE +## PREPARE SMS OUTPUT FOR ${GUILDE} GUILDE rm -f /tmp/cut_* 2>/dev/null jump=160 -BIODYNSMS=$(cat /tmp/sms | head -c+$jump) -echo "$BIODYNSMS" > /tmp/cut_$jump +GUILDESMS=$(cat /tmp/sms | head -c+$jump) +echo "$GUILDESMS" > /tmp/cut_$jump echo "#!/bin/bash -sudo gammu sendsms TEXT \"_PHONE_\" -text \"${BIODYNSMS}\"" > /home/${YOU}/.zen/SMS/GUILDES/BIODYN/OUTPUT/$(date -u +%s%N | cut -b1-13).tosend.sh +sudo gammu sendsms TEXT \"_PHONE_\" -text \"${GUILDESMS}\"" > /home/${YOU}/.zen/SMS/GUILDES/${GUILDE}/OUTPUT/$(date -u +%s%N | cut -b1-13).tosend.sh ## SPLIT SMS INTO 160 CHAR CUT ? -BIODYNSMSLEFT=$(cat /tmp/sms | tail -c+$jump) -while [[ $BIODYNSMSLEFT ]]; do - BIODYNSMS=$(echo $BIODYNSMSLEFT | head -c+$jump) +GUILDESMSLEFT=$(cat /tmp/sms | tail -c+$jump) +while [[ $GUILDESMSLEFT ]]; do + GUILDESMS=$(echo $GUILDESMSLEFT | head -c+$jump) jump=$((jump + 160)) - echo "$BIODYNSMS" - echo "$BIODYNSMS" > /tmp/cut_$jump + echo "$GUILDESMS" + echo "$GUILDESMS" > /tmp/cut_$jump echo "#!/bin/bash -sudo gammu sendsms TEXT \"_PHONE_\" -text \"${BIODYNSMS}\"" > /home/${YOU}/.zen/SMS/GUILDES/BIODYN/OUTPUT/$(date -u +%s%N | cut -b1-13).tosend.sh - BIODYNSMSLEFT=$(cat /tmp/sms | tail -c+$jump) +sudo gammu sendsms TEXT \"_PHONE_\" -text \"${GUILDESMS}\"" > /home/${YOU}/.zen/SMS/GUILDES/${GUILDE}/OUTPUT/$(date -u +%s%N | cut -b1-13).tosend.sh + GUILDESMSLEFT=$(cat /tmp/sms | tail -c+$jump) done -chmod +x /home/${YOU}/.zen/SMS/GUILDES/BIODYN/OUTPUT/*.tosend.sh +chmod +x /home/${YOU}/.zen/SMS/GUILDES/${GUILDE}/OUTPUT/*.tosend.sh