diff --git a/G1BILLETS.sh b/G1BILLETS.sh index a3fcb28..cce4113 100755 --- a/G1BILLETS.sh +++ b/G1BILLETS.sh @@ -58,28 +58,6 @@ do rm -f /tmp/secret.dunikey echo "$boucle : $BILLETPUBKEY" -########################################################################### - ## ASTRO : FIND TW ADDRESS + EMAIL = CREATE PLAYER on 1234 API - if [[ "$STYLE" == "astro" ]]; then - - ${MY_PATH}/keygen -t ipfs -o ${MY_PATH}/tmp/g1billet.${UNIQID}.ipns.key "$SALT" "$SECRET" - ASTRONAUTENS=$(ipfs key import ${UNIQID} -f pem-pkcs8-cleartext ${MY_PATH}/tmp/g1billet.${UNIQID}.ipns.key) - - rm -f ${MY_PATH}/tmp/g1billet.${UNIQID}.ipns.key - ipfs key rm ${UNIQID} && echo "/ipns/$ASTRONAUTENS" - - UN=$(echo ${SALT} | jq -Rr @uri) ## URL ENCODED - DE=$(echo ${SECRET} | jq -Rr @uri) ## URL ENCODED - - [[ ${EMAIL} ]] \ - && echo 'https://astroport.copylaradio.com/?salt='$UN'&pepper='$DE'&g1pub=on&email='$EMAIL \ - && curl -s 'https://astroport.copylaradio.com/?salt='$UN'&pepper='$DE'&g1pub=on&email='$EMAIL - - echo "WELCOME ASTRONAUT $EMAIL" - - fi -########################################################################### - # CREATION FICHIER IMAGE BILLET dans ${MY_PATH}/tmp/g1billet/${UNIQID} $(${MY_PATH}/MAKE_G1BILLET.sh "${SALT}" "${SECRET}" "${MONTANT}" "${BILLETPUBKEY}" "${UNIQID}" "${STYLE}" "${ASTRONAUTENS}" "${EMAIL}") @@ -116,6 +94,29 @@ fi echo "$ZFILE" ### LAST LINE : INFORM DAEMON +########################################################################### + ## ASTRO : FIND TW ADDRESS + EMAIL = CREATE PLAYER on 1234 API + if [[ "$STYLE" == "astro" ]]; then + + ${MY_PATH}/keygen -t ipfs -o ${MY_PATH}/tmp/g1billet.${UNIQID}.ipns.key "$SALT" "$SECRET" + ASTRONAUTENS=$(ipfs key import ${UNIQID} -f pem-pkcs8-cleartext ${MY_PATH}/tmp/g1billet.${UNIQID}.ipns.key) + + rm -f ${MY_PATH}/tmp/g1billet.${UNIQID}.ipns.key + ipfs key rm ${UNIQID} && echo "/ipns/$ASTRONAUTENS" + + UN=$(echo ${SALT} | jq -Rr @uri) ## URL ENCODED + DE=$(echo ${SECRET} | jq -Rr @uri) ## URL ENCODED + + [[ ${EMAIL} ]] \ + && echo curl -s 'https://astroport.copylaradio.com/?salt='$UN'&pepper='$DE'&g1pub=on&email='$EMAIL \ + && curl -s 'https://astroport.copylaradio.com/?salt='$UN'&pepper='$DE'&g1pub=on&email='$EMAIL + + echo "WELCOME ASTRONAUT $EMAIL" + + fi +########################################################################### + + else ################################################################################ ## MAKE IT A NETWORK MICRO SERVICE -- PORTS : INPUT=33101 OUTPUT=33102 @@ -214,7 +215,7 @@ while true; do # EXECUTE COMMAND LOG=$(${MY_PATH}/${ME} "$MONTANT" "$STYLE") - # echo $LOG + echo $LOG # EXTRACT VALUES FROM SELF LOG IPNS=$(echo "$LOG" | grep '/ipns/') [[ $IPNS ]] && echo "TW IPNS : $IPNS" @@ -247,12 +248,15 @@ Content-Disposition: attachment; filename='${FILE_NAME}' cat ${ZFILE} >> ${MY_PATH}/tmp/http.${MOATS} # NETCAT PUBLISH port=33102 -echo "33102 LOADING" -(cat ${MY_PATH}/tmp/http.${MOATS} | nc -l -p 33102 -q 1 > /dev/null 2>&1) & -echo "DELIVERED ${MOATS} : $$RNAME" -rm -f "${MY_PATH}/tmp/http.${MOATS}" +echo "PUBLISHING ${MOATS} : $RNAME" + +( + cat ${MY_PATH}/tmp/http.${MOATS} | nc -l -p 33102 -q 1 > /dev/null 2>&1 \ + && rm -f "${MY_PATH}/tmp/http.${MOATS}" \ + && rm -f "${ZFILE}" \ + && echo "G1BILLETS FILE CONSUMED" +) & -rm -f "${ZFILE}" done