diff --git a/tools/cron_VRFY.sh b/tools/cron_VRFY.sh index 9aee54c1..640b1d21 100755 --- a/tools/cron_VRFY.sh +++ b/tools/cron_VRFY.sh @@ -35,7 +35,7 @@ if [[ ! $crontest ]]; then ## HEADER [[ $1 == "OFF" ]] && exit 0 [[ ! $(cat /tmp/mycron | grep -F 'SHELL') ]] && echo "SHELL=/bin/bash" > /tmp/newcron - [[ ! $(cat /tmp/mycron | grep -F 'PATH') ]] && echo "PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin" >> /tmp/newcron + [[ ! $(cat /tmp/mycron | grep -F 'PATH') ]] && echo "USER=$USER;PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin" >> /tmp/newcron cat /tmp/mycron >> /tmp/newcron # ADD 20h12.process.sh line echo "12 20 * * * /bin/bash $MY_PATH/../20h12.process.sh > /tmp/20h12.log 2>&1" >> /tmp/newcron @@ -52,7 +52,7 @@ else ## HEADER [[ $1 == "ON" ]] && exit 0 [[ ! $(cat /tmp/mycron | grep -F 'SHELL') ]] && echo "SHELL=/bin/bash" > /tmp/newcron - [[ ! $(cat /tmp/mycron | grep -F 'PATH') ]] && echo "PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin" >> /tmp/newcron + [[ ! $(cat /tmp/mycron | grep -F 'PATH') ]] && echo "USER=$USER;PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin" >> /tmp/newcron ## REMOVE 20h12.process.sh line cat /tmp/mycron | grep -Ev '20h12.process.sh' >> /tmp/newcron crontab /tmp/newcron @@ -64,7 +64,7 @@ else echo "KEEPING 20H12 CRON ACTIVATED" ## LOW DISK RESSOURCES IPFS MODE [[ ! $(cat /tmp/mycron | grep -F 'SHELL') ]] && echo "SHELL=/bin/bash" > /tmp/newcron - [[ ! $(cat /tmp/mycron | grep -F 'PATH') ]] && echo "PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin" >> /tmp/newcron + [[ ! $(cat /tmp/mycron | grep -F 'PATH') ]] && echo "USER=$USER;PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin" >> /tmp/newcron cat /tmp/mycron >> /tmp/newcron # ADD 20h12.process.sh line [[ ! $(cat /tmp/mycron | grep '20h12.process.sh') ]] && echo "12 20 * * * /bin/bash $MY_PATH/../20h12.process.sh > /tmp/20h12.log 2>&1" >> /tmp/newcron diff --git a/tools/new_file_in_astroport.sh b/tools/new_file_in_astroport.sh index f6e7a8dd..4834ca71 100755 --- a/tools/new_file_in_astroport.sh +++ b/tools/new_file_in_astroport.sh @@ -355,7 +355,8 @@ cp ~/Astroport/${PLAYER}/${TyPE}/${REFERENCE}/${MEDIAKEY}.dragdrop.json "$HOME/. ## TODO : Do we keep that ? # echo "SEND TW LINK to GCHANGE MESSAGE" -[[ $3 ]] && ~/.zen/Astroport.ONE/tools/jaklis/jaklis.py -k ~/.zen/game/players/$PLAYER/secret.dunikey -n "$myDATA" send -d "$3" -t "${TITLE} ${MEDIAKEY}" -m "MEDIA : $myIPFSGW/ipfs/${IPFSREPFILEID}" +[[ $3 ]] \ +&& ~/.zen/Astroport.ONE/tools/timeout.sh -t 12 ~/.zen/Astroport.ONE/tools/jaklis/jaklis.py -k ~/.zen/game/players/$PLAYER/secret.dunikey -n "$myDATA" send -d "$3" -t "${TITLE} ${MEDIAKEY}" -m "MEDIA : $myIPFSGW/ipfs/${IPFSREPFILEID}" fi