Accueil VISA issu de compte Gchange et Astronaute existant (TW), nouveau PLAYER
This commit is contained in:
parent
a11b0cad4f
commit
f091baa07a
12
start.sh
12
start.sh
|
@ -34,7 +34,7 @@ IPFSNODEID=$(cat ~/.ipfs/config | jq -r .Identity.PeerID)
|
||||||
|
|
||||||
## CREATE AND OR CONNECT USER
|
## CREATE AND OR CONNECT USER
|
||||||
PS3='Créez VISA ou connectez-vous à votre compte Astronaute ___ '
|
PS3='Créez VISA ou connectez-vous à votre compte Astronaute ___ '
|
||||||
players=("NOUVEAU VISA" $(ls ~/.zen/game/players 2>/dev/null))
|
players=("NOUVEAU VISA" "IMPORT GVISA" $(ls ~/.zen/game/players 2>/dev/null))
|
||||||
[[ ${#players[@]} -lt 3 && ! "$1" ]] && PLAYERONE="${players[1]}" && echo $PLAYERONE
|
[[ ${#players[@]} -lt 3 && ! "$1" ]] && PLAYERONE="${players[1]}" && echo $PLAYERONE
|
||||||
|
|
||||||
## MULTIPLAYER
|
## MULTIPLAYER
|
||||||
|
@ -47,6 +47,16 @@ IPFSNODEID=$(cat ~/.ipfs/config | jq -r .Identity.PeerID)
|
||||||
echo "Astronaute $fav bienvenue dans le jeu de terraformation forêt jardin MadeInZion"
|
echo "Astronaute $fav bienvenue dans le jeu de terraformation forêt jardin MadeInZion"
|
||||||
exit
|
exit
|
||||||
;;
|
;;
|
||||||
|
"IMPORT GVISA")
|
||||||
|
echo "Saisissez votre 'identifiant Gchange'"
|
||||||
|
read SALT
|
||||||
|
echo "Saisissez votre 'mot de passe Gchange'"
|
||||||
|
read PEPPER
|
||||||
|
${MY_PATH}/tools/VISA.new.sh "$SALT" "$PEPPER"
|
||||||
|
fav=$(cat ~/.zen/tmp/PSEUDO 2>/dev/null) && rm ~/.zen/tmp/PSEUDO
|
||||||
|
echo "Astronaute $fav heureux de vous acceuillir"
|
||||||
|
exit
|
||||||
|
;;
|
||||||
"")
|
"")
|
||||||
echo "Choix obligatoire. exit"
|
echo "Choix obligatoire. exit"
|
||||||
exit
|
exit
|
||||||
|
|
|
@ -27,17 +27,19 @@ if [[ $SALT != "" && PEPPER != "" ]]; then
|
||||||
rm -f ~/.zen/tmp/TW/index.html
|
rm -f ~/.zen/tmp/TW/index.html
|
||||||
ipfs --timeout 6s cat /ipns/$GNS > ~/.zen/tmp/TW/index.html
|
ipfs --timeout 6s cat /ipns/$GNS > ~/.zen/tmp/TW/index.html
|
||||||
|
|
||||||
# Combien de clefs?
|
|
||||||
ipfs key list -l | grep -w $GNS
|
|
||||||
ipfs key list -l | grep -w $GNS | wc -l
|
|
||||||
|
|
||||||
if [ ! -s ~/.zen/tmp/TW/index.html ]; then
|
if [ ! -s ~/.zen/tmp/TW/index.html ]; then
|
||||||
rm -f ~/.zen/tmp/TW/index.html
|
rm -f ~/.zen/tmp/TW/index.html
|
||||||
echo "Aucun ancien TW détecté! Appuyez sur ENTRER pour créer un nouveau TW Astronaute"
|
echo "Aucun ancien TW détecté! Appuyez sur ENTRER pour créer votre TW Astronaute" ## Compte Gchange
|
||||||
read
|
read
|
||||||
else
|
else
|
||||||
ASTRO="yes"
|
ASTRO="yes"
|
||||||
echo "Bienvenue Astronaute. Nous avons capté votre TW"
|
# EXTRACTION MOA
|
||||||
|
rm -f ~/.zen/tmp/tiddlers.json
|
||||||
|
tiddlywiki --load ~/.zen/tmp/TW/index.html --output ~/.zen/tmp --render '.' 'tiddlers.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' '[tag[moa]]'
|
||||||
|
TITLE=$(cat ~/.zen/tmp/tiddlers.json | jq -r '.[].title') # Dessin de PLAYER
|
||||||
|
PLAYER=$(echo $TITLE | rev | cut -f 1 -d ' ' | rev)
|
||||||
|
[[ $(ls ~/.zen/game/players/$PLAYER 2>/dev/null) ]] && echo "PLAYER déjà présent sur cet Astroport" && exit 0
|
||||||
|
echo "Bienvenue Astronaute $PLAYER. Nous avons capté votre TW"
|
||||||
echo "http://127.0.0.1:8080/ipns/$GNS"
|
echo "http://127.0.0.1:8080/ipns/$GNS"
|
||||||
echo "Initialisation de votre compte local"
|
echo "Initialisation de votre compte local"
|
||||||
fi
|
fi
|
||||||
|
@ -52,8 +54,9 @@ Solar Punk garden forest terraforming game.
|
||||||
=============================================
|
=============================================
|
||||||
Bienvenue 'Astronaute'"; sleep 1
|
Bienvenue 'Astronaute'"; sleep 1
|
||||||
|
|
||||||
echo ""
|
|
||||||
echo "Création de votre PSEUDO, votre PLAYER, avec PASS (6 chiffres)"
|
echo "$TITLE"
|
||||||
|
[[ ! $ASTRO ]] && echo "Création de votre PSEUDO, votre PLAYER, avec PASS (6 chiffres)"
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
MY_PATH="`dirname \"$0\"`" # relative
|
MY_PATH="`dirname \"$0\"`" # relative
|
||||||
|
@ -68,9 +71,10 @@ echo "-> SALT : $SALT"
|
||||||
[[ $PEPPER == "" ]] && PEPPER=$(${MY_PATH}/diceware.sh 2 | xargs)
|
[[ $PEPPER == "" ]] && PEPPER=$(${MY_PATH}/diceware.sh 2 | xargs)
|
||||||
echo "-> PEPPER : $PEPPER"
|
echo "-> PEPPER : $PEPPER"
|
||||||
|
|
||||||
echo "CHOISISSEZ UN PSEUDO" && read PSEUDO; PSEUDO=${PSEUDO,,} && [[ $(ls ~/.zen/game/players/$PSEUDO* 2>/dev/null) ]] && echo "CE PSEUDO EST DEJA UN PLAYER. EXIT" && exit 1
|
PSEUDO=${PLAYER%%[0-9]*}
|
||||||
|
[[ ! $PSEUDO ]] && echo "Choisissez un pseudo : " && read PSEUDO; PSEUDO=${PSEUDO,,}; PSEUDO=${PSEUDO%%[0-9]*} && [[ $(ls ~/.zen/game/players/$PSEUDO* 2>/dev/null) ]] && echo "CE PSEUDO EST DEJA UN PLAYER. EXIT" && exit 1
|
||||||
# PSEUDO=${PSEUDO,,} #lowercase
|
# PSEUDO=${PSEUDO,,} #lowercase
|
||||||
PLAYER=${PSEUDO}${RANDOM:0:2}$(${MY_PATH}/diceware.sh 1 | xargs)${RANDOM:0:2}
|
[[ ! $PLAYER ]] && PLAYER=${PSEUDO}${RANDOM:0:2}$(${MY_PATH}/diceware.sh 1 | xargs)${RANDOM:0:2}
|
||||||
[[ -d ~/.zen/game/players/$PLAYER ]] && echo "FATAL ERROR $PLAYER NAME COLLISION. TRY AGAIN." && exit 1
|
[[ -d ~/.zen/game/players/$PLAYER ]] && echo "FATAL ERROR $PLAYER NAME COLLISION. TRY AGAIN." && exit 1
|
||||||
|
|
||||||
[[ ! $PSEUDO ]] && PSEUDO=$PLAYER
|
[[ ! $PSEUDO ]] && PSEUDO=$PLAYER
|
||||||
|
@ -117,7 +121,6 @@ G1PUB=$(cat /tmp/secret.dunikey | grep 'pub:' | cut -d ' ' -f 2)
|
||||||
ipfs key import $PLAYER -f pem-pkcs8-cleartext ~/.zen/game/players/$PLAYER/secret.player
|
ipfs key import $PLAYER -f pem-pkcs8-cleartext ~/.zen/game/players/$PLAYER/secret.player
|
||||||
ASTRONAUTENS=$(ipfs key import $G1PUB -f pem-pkcs8-cleartext ~/.zen/game/players/$PLAYER/secret.player)
|
ASTRONAUTENS=$(ipfs key import $G1PUB -f pem-pkcs8-cleartext ~/.zen/game/players/$PLAYER/secret.player)
|
||||||
|
|
||||||
|
|
||||||
mkdir -p ~/.zen/game/players/$PLAYER/ipfs/G1SSB # Prepare astrXbian sub-datastructure
|
mkdir -p ~/.zen/game/players/$PLAYER/ipfs/G1SSB # Prepare astrXbian sub-datastructure
|
||||||
mkdir -p ~/.zen/game/players/$PLAYER/ipfs_swarm
|
mkdir -p ~/.zen/game/players/$PLAYER/ipfs_swarm
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue