diff --git a/12345.sh b/12345.sh index 975c0857..0a01e294 100755 --- a/12345.sh +++ b/12345.sh @@ -73,6 +73,8 @@ while true; do ## RANDOM PORT SWAPPINESS AVOIDING COLLISION fi + [ ${PORT} -eq 12345 ] && PORT=$((PORT+1)) ## AVOID _12345.sh SWARM SUBMAP PORT + ## CHECK PORT IS FREE & KILL OLD ONE pidportinuse=$(ps axf --sort=+utime | grep -w "nc -l -p ${PORT}" | grep -v -E 'color=auto|grep' | awk '{gsub(/^ +| +$/,"")} {print $0}' | tail -n 1 | cut -d " " -f 1) [[ $pidportinuse ]] && kill -9 $pidportinuse && echo "$(date) KILLING LOST $pidportinuse" diff --git a/ASTROBOT/G1CopierYoutube.sh b/ASTROBOT/G1CopierYoutube.sh index be34f6a4..6dce696a 100755 --- a/ASTROBOT/G1CopierYoutube.sh +++ b/ASTROBOT/G1CopierYoutube.sh @@ -149,7 +149,7 @@ if [[ ! ${TIDDLER} ]]; then echo "No FILE -- TRYING TO RESTORE CACHE FROM TW --" tiddlywiki --load ${INDEX} \ --output ~/.zen/game/players/${PLAYER}/G1CopierYoutube \ - --render '.' "'$YID.TW.json" 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' "${ZFILE}" \ + --render '.' "$YID.TW.json" 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' "${ZFILE}" \ && rm "${HOME}/.zen/game/players/${PLAYER}/G1CopierYoutube/${ZFILE}.json" && ln -s "${HOME}/.zen/game/players/${PLAYER}/G1CopierYoutube/$YID.TW.json" "${HOME}/.zen/game/players/${PLAYER}/G1CopierYoutube/${ZFILE}.json" continue fi diff --git a/tools/VOEUX.print.sh b/tools/VOEUX.print.sh index a03e5136..bafa1f95 100755 --- a/tools/VOEUX.print.sh +++ b/tools/VOEUX.print.sh @@ -23,6 +23,7 @@ G1PUB=$4 PASS=$(echo "${RANDOM}${RANDOM}${RANDOM}${RANDOM}" | tail -c-7) UPASS=$(date '+%Y%m') # YYYYMM +DPASS=$(date '+%Y%m%d') # YYYYMMDD PPASS=$(cat ~/.zen/game/players/.current/.pass 2>/dev/null) ############################################################ G1Voeu.sh use diff --git a/www/G1PalPay/index.html b/www/G1PalPay/index.html index 8ae3fbaf..ac4730f4 100644 --- a/www/G1PalPay/index.html +++ b/www/G1PalPay/index.html @@ -117,6 +117,16 @@ a {

♥Box Ğ1Station


+
+ +      + +

Oubliez la crise !

Utilisez la Monnaie Libre.

Explorez le Monde en confiance...

@@ -128,7 +138,7 @@ a {

___

- +

G1PUB destinataire

@@ -193,12 +203,25 @@ a { if (content.startsWith('~~~~~')) { // GET APPNAME var appname = document.querySelector('input[name="appname"]:checked').value; - // GET PASS THAT DECODE PGP - var pass = prompt("Saisir PASS:"); + + // GET PASS TO DECODE PGP + var oldpass = document.getElementById("PASS").value; + if ( oldpass == 'PASS') { + var pass = prompt("Saisir PASS:"); + } else { + var pass = oldpass; + } // PREVIOUS G1PUB SCAN var g1pub = document.getElementById("g1pub").value; + // MEMORIZE + if ( appname == 'pay') { + document.getElementById("PASS").value = pass; + } else { + document.getElementById("PASS").value = "PASS"; + } + // APPNAME : DATA COLLECT & ARRANGE if ( appname == 'pay') { var amount = prompt("MONTANT (Ğ1) ?");