From 5528b3d0b0a31aaa4f12298933b68b7076d309e6 Mon Sep 17 00:00:00 2001 From: fred Date: Fri, 7 Apr 2023 13:22:28 +0200 Subject: [PATCH] =?UTF-8?q?=E2=99=A5Box=20=C4=9E1Station=20-=20Astroport?= =?UTF-8?q?=20=C5=8A1=20${IPNSTAIL}=20!=3D=20"=5FASTROPORT=5F"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ASTROBOT/PLAYER.refresh.sh | 2 +- command.sh | 12 ++++++------ templates/register.html | 1 - www/G1PalPay/index.html | 6 ++++-- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/ASTROBOT/PLAYER.refresh.sh b/ASTROBOT/PLAYER.refresh.sh index 05a74b3a..2db7fb7b 100755 --- a/ASTROBOT/PLAYER.refresh.sh +++ b/ASTROBOT/PLAYER.refresh.sh @@ -114,7 +114,7 @@ for PLAYER in ${PLAYERONE[@]}; do echo "TW ASTROPORT GATEWAY : ${ASTROPORT}" ## MOVED PLAYER (KEY IS KEPT ON LAST CONNECTED ASTROPORT) - if [[ ${IPNSTAIL} != ${IPFSNODEID} ]]; then + if [[ ${IPNSTAIL} != ${IPFSNODEID} && ${IPNSTAIL} != "_ASTROPORT_" ]]; then echo "> I AM ${IPFSNODEID} : PLAYER MOVED TO ${IPNSTAIL} : EJECTION " echo "REMOVE PLAYER & G1VOEU IPNS KEYS" ipfs key rm "${PLAYER}" "${PLAYER}_feed" "$G1PUB" diff --git a/command.sh b/command.sh index eb2012c8..ce2e4c9a 100755 --- a/command.sh +++ b/command.sh @@ -102,7 +102,7 @@ echo "Activation Réseau P2P Astroport !" echo PS3="$PLAYER choisissez : __ " -choices=("CREER UN VOEU" "PRINT QRVOEU" "PRINT VISA" "REMOVE PLAYER" "QUITTER") +choices=("MAKE UN VOEU" "PRINT QRVOEU" "PRINT VISA" "UNPLUG PLAYER" "QUIT") select fav in "${choices[@]}"; do case $fav in "PRINT VISA") @@ -110,7 +110,7 @@ select fav in "${choices[@]}"; do ${MY_PATH}/tools/VISA.print.sh "$PLAYER" ;; - "REMOVE PLAYER") + "UNPLUG PLAYER") echo "ATTENTION ${PLAYER} DECONNEXION DE VOTRE TW !!" echo "Enter to continue. Ctrl+C to stop" read @@ -122,14 +122,14 @@ select fav in "${choices[@]}"; do ipfs key rm $voeu done - ## REMOVE PLAYER DOCKER + ## UNPLUG PLAYER DOCKER [[ $USER == "zen" ]] && make player MAIL=$PLAYER DELETE=true #~ echo "REMOVING GCHANGE+ PROFILE" #~ $MY_PATH/tools/jaklis/jaklis.py -k $HOME/.zen/game/players/$PLAYER/secret.dunikey -n "$myDATA" erase #~ $MY_PATH/tools/jaklis/jaklis.py -k $HOME/.zen/game/players/$PLAYER/secret.dunikey -n "$myCESIUM" erase - echo "PLAYER IPNS KEYS REMOVED" + echo "PLAYER IPNS KEYS UNPLUGD" echo "rm -Rf ~/.zen/game/players/$PLAYER" rm -Rf ~/.zen/game/players/$PLAYER @@ -141,7 +141,7 @@ select fav in "${choices[@]}"; do #~ ${MY_PATH}/tools/vlc_webcam.sh "$PLAYER" #~ ;; - "CREER UN VOEU") + "MAKE UN VOEU") echo "QRCode à coller sur les lieux ou objets portant une Gvaleur" cp ~/.zen/game/players/$PLAYER/ipfs/moa/index.html ~/.zen/tmp/$PLAYER.html ${MY_PATH}/ASTROBOT/G1Voeu.sh "" "$PLAYER" "$HOME/.zen/tmp/$PLAYER.html" @@ -166,7 +166,7 @@ select fav in "${choices[@]}"; do ${MY_PATH}/tools/VOEUX.print.sh $PLAYER ;; - "QUITTER") + "QUIT") echo "CIAO" && exit 0 ;; diff --git a/templates/register.html b/templates/register.html index b19a3d6d..b4f98587 100644 --- a/templates/register.html +++ b/templates/register.html @@ -64,7 +64,6 @@ header {