diff --git a/tools/PAY4SURE.sh b/tools/PAY4SURE.sh index 83d2f2ede..980fd94b3 100755 --- a/tools/PAY4SURE.sh +++ b/tools/PAY4SURE.sh @@ -60,14 +60,19 @@ rm -f ${PENDINGFILE} 2>/dev/null ## CLEAN START ## PREPARE CALLING MYSELF AGAIN COMMAND cp ${KEYFILE} ${PENDINGDIR}/secret.key 2>/dev/null echo '#!/bin/bash -bash ${ME} "${KEYFILE}" "${AMOUNT}" "${G1PUB}" "${COMMENT}" "${MOATS}" +bash '${ME}' "'${KEYFILE}'" "'${AMOUNT}'" "'${G1PUB}'" "'${COMMENT}'" "'${MOATS}'" ' > ${PENDINGDIR}/${MOATS}_replay.sh +chmod +x ${PENDINGDIR}/${MOATS}_replay.sh rm -f ${PENDINGDIR}/${MOATS}.result -# MAKE PAYMENT -${MY_PATH}/jaklis/jaklis.py -k ${PENDINGDIR}/secret.key pay -a ${AMOUNT} -p ${G1PUB} -c '${COMMENT}' -m 2>&1> ${PENDINGDIR}/${MOATS}.result -if [ $? == 0 ]; then +################################################ +# MAKE PAYMENT +${MY_PATH}/jaklis/jaklis.py -k ${PENDINGDIR}/secret.key pay -a ${AMOUNT} -p ${G1PUB} -c "${COMMENT}" -m 2>&1> ${PENDINGDIR}/${MOATS}.result +CHK=$(cat ${PENDINGDIR}/${MOATS}.result | head -n 1 ) +echo ${CHK} + +if [ $? == 0 || ${CHK} == 'Le document généré est conforme.' ]; then echo "SENT" > ${PENDINGFILE} ## TODO : MONITOR POTENTIAL CHAIN REJECTION (FORK/MERGE WINDOW) @@ -88,12 +93,12 @@ if [ $? == 0 ]; then ZENCUR=$(echo "$COINS * 10" | bc | cut -d '.' -f 1) ZENDES=$(echo "$DES * 10" | bc | cut -d '.' -f 1) - echo "

ẐEN OPERATION

+ echo "

ẐEN OPERATION

${PAYOUTPUB}
${ZENCUR} - ${ZENAMOUNT}

${G1PUB}
${ZENDES} + ${ZENAMOUNT}

-

OK

" >> ${PENDINGDIR}/${MOATS}.result +

OK

" >> ${PENDINGDIR}/${MOATS}.result $MY_PATH/mailjet.sh "support@qo-op.com" ${PENDINGDIR}/${MOATS}.result @@ -105,9 +110,9 @@ else ## INFORM SYSTEM MUST RENEW OPERATION rm ${PENDINGFILE} - echo "

BLOCKCHAIN CONNEXION ERROR

+ echo "

BLOCKCHAIN CONNEXION ERROR

- MUST RETRY -

- LAUNCHING SUB SHELL" >> ${PENDINGDIR}/${MOATS}.result + LAUNCHING SUB SHELL" >> ${PENDINGDIR}/${MOATS}.result ## COUNT NUMBER OF TRY try=$(cat ${PENDINGDIR}/${MOATS}.try 2>/dev/null) || try=0 diff --git a/tools/PLAYER.unplug.sh b/tools/PLAYER.unplug.sh index 0857203d4..c2532bf47 100755 --- a/tools/PLAYER.unplug.sh +++ b/tools/PLAYER.unplug.sh @@ -67,7 +67,7 @@ mkdir -p ~/.zen/tmp/${MOATS} ## SEND PLAYER LAST KNOW TW TW=$(ipfs add -Hq ${INDEX} | tail -n 1) -${MY_PATH}/../tools/mailjet.sh "${PLAYER}" "Hello ${PLAYER},
Your TW is unplugged from Astroport Station : TW LAST STATE.

May the force be with you." +${MY_PATH}/../tools/mailjet.sh "${PLAYER}" "

Hello ${PLAYER},

Your TW is unplugged from Astroport : LAST TW STATE.

May the force be with you.

" echo "PLAYER IPNS KEYS UNPLUGED" echo "rm -Rf ~/.zen/game/players/${PLAYER}"