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 "