diff --git a/command.sh b/command.sh index ce2e4c9a..fc897ad4 100755 --- a/command.sh +++ b/command.sh @@ -34,18 +34,18 @@ echo 'PRESS ENTER... '; read ## CREATE AND OR CONNECT USER PS3='Astronaute connectez votre PLAYER ___ ' - players=("NOUVEAU VISA" "IMPORT PLAYER" $(ls ~/.zen/game/players | grep "@" 2>/dev/null)) + players=("MAKE G1PASS" "IMPORT G1PASS" $(ls ~/.zen/game/players | grep "@" 2>/dev/null)) ## MULTIPLAYER select fav in "${players[@]}"; do case $fav in - "NOUVEAU VISA") + "MAKE G1PASS") ${MY_PATH}/tools/VISA.new.sh fav=$(cat ~/.zen/tmp/PSEUDO 2>/dev/null) && rm ~/.zen/tmp/PSEUDO echo "Astronaute $fav bienvenue dans le jeu de terraformation forĂȘt jardin MadeInZion" exit ;; - "IMPORT PLAYER") + "IMPORT G1PASS") echo "'Secret 1'" read SALT echo "'Secret 2'" diff --git a/tools/VISA.new.sh b/tools/VISA.new.sh index c053b91e..41691636 100755 --- a/tools/VISA.new.sh +++ b/tools/VISA.new.sh @@ -290,9 +290,9 @@ DISCO="/?salt=${USALT}&pepper=${UPEPPER}" ## USING SWARMKEY (derivated from IPFSNODE "/proc/cpuinfo" key made by _12345.sh) ## HARDWARE SPECIFIC KEY ## # TODO : NODE COULD FORGET PASS THEN DECODE ${PLAYER}/secret.dunikey FROM TW # PROD # - NODEPUB=$(${MY_PATH}/ipfs_to_g1.py ${IPFSNODEID}) + MACHINEPUB=$(cat $HOME/.zen/game/secret.dunikey | grep pub | cut -d ' ' -f 2) echo "# CRYPTO ENCODING _SECRET_ " - ${MY_PATH}/natools.py encrypt -p ${NODEPUB} -i $HOME/.zen/game/players/${PLAYER}/secret.dunikey -o $HOME/.zen/tmp/${MOATS}/secret.dunikey.$G1PUB.enc + ${MY_PATH}/natools.py encrypt -p ${MACHINEPUB} -i $HOME/.zen/game/players/${PLAYER}/secret.dunikey -o $HOME/.zen/tmp/${MOATS}/secret.dunikey.$G1PUB.enc ENCODING=$(cat ~/.zen/tmp/${MOATS}/secret.dunikey.$G1PUB.enc | base16) sed -i "s~${OLD16}~${ENCODING}~g" ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html # echo "${ENCODING}" @@ -305,7 +305,7 @@ DISCO="/?salt=${USALT}&pepper=${UPEPPER}" ########### ## CRYPTO PROCESS VALIDATED [[ -s ~/.zen/tmp/${MOATS}/crypto.2 ]] && echo "NATOOLS LOADED" \ - || echo "NATOOLS ERRORS - CHECK STATION" # NODEPUB CRYPTO ERROR + || echo "NATOOLS ERRORS - CHECK STATION" # MACHINEPUB CRYPTO ERROR ###########