PLUG / UNPLUG
This commit is contained in:
parent
6a409ad5c1
commit
f83e1606e0
|
|
@ -132,7 +132,7 @@ for PLAYER in ${PLAYERONE[@]}; do
|
|||
UMAPNS=$(cat ~/.zen/tmp/${MOATS}/GPS.json | jq -r .[].umap)
|
||||
LAT=$(cat ~/.zen/tmp/${MOATS}/GPS.json | jq -r .[].lat)
|
||||
LON=$(cat ~/.zen/tmp/${MOATS}/GPS.json | jq -r .[].lon)
|
||||
echo "> GPS_${LAT}_${LON} : ${UMAPNS}"
|
||||
echo "LAT=${LAT}; LON=${LON}; UMAPNS=${UMAPNS}"
|
||||
|
||||
########### ASTROPORT is not IPFSNODEID => EJECT TW
|
||||
## MOVED PLAYER (KEY IS KEPT ON LAST CONNECTED ASTROPORT)
|
||||
|
|
|
|||
62
command.sh
62
command.sh
|
|
@ -9,6 +9,8 @@ MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized
|
|||
. "${MY_PATH}/tools/my.sh"
|
||||
|
||||
TS=$(date -u +%s%N | cut -b1-13)
|
||||
MOATS=$(date -u +"%Y%m%d%H%M%S%4N")
|
||||
mkdir -p ~/.zen/tmp/${MOATS}
|
||||
|
||||
echo '
|
||||
_ ____ _____ ____ ___ ____ ___ ____ _____ ___ _ _ _____
|
||||
|
|
@ -109,7 +111,7 @@ echo "Votre Pass Astroport.ONE : $(cat ~/.zen/game/players/$PLAYER/.pass 2>/dev
|
|||
export G1PUB=$(cat ~/.zen/game/players/$PLAYER/secret.dunikey | grep 'pub:' | cut -d ' ' -f 2)
|
||||
[ ! ${G1PUB} ] && echo "ERROR. MAUVAIS PASS. EXIT" && exit 1
|
||||
|
||||
echo "Clef Publque Astronaute : $G1PUB"
|
||||
echo "Clef Publique Astronaute : $G1PUB"
|
||||
echo "ENTREE ACCORDEE"
|
||||
echo
|
||||
export ASTRONAUTENS=$(ipfs key list -l | grep -w "$PLAYER" | cut -d ' ' -f 1)
|
||||
|
|
@ -136,21 +138,54 @@ select fav in "${choices[@]}"; do
|
|||
read
|
||||
espeak "Droping TW in cyber space"
|
||||
|
||||
ipfs key rm ${PLAYER}; ipfs key rm ${PLAYER}_feed; ipfs key rm $G1PUB;
|
||||
for vk in $(ls -d ~/.zen/game/players/${PLAYER}/voeux/*/* | rev | cut -d / -f 1 | rev); do
|
||||
ipfs key rm $vk
|
||||
done
|
||||
## REMOVING PLAYER FROM UMAP
|
||||
## GET "GPS" TIDDLER
|
||||
tiddlywiki --load ~/.zen/game/players/${PLAYER}/ipfs/moa/index.html \
|
||||
--output ~/.zen/tmp/${MOATS} \
|
||||
--render '.' 'GPS.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'GPS' ## GPS Tiddler
|
||||
TWMAPNS=$(cat ~/.zen/tmp/${MOATS}/GPS.json | jq -r .[].umap)
|
||||
LAT=$(cat ~/.zen/tmp/${MOATS}/GPS.json | jq -r .[].lat)
|
||||
LON=$(cat ~/.zen/tmp/${MOATS}/GPS.json | jq -r .[].lon)
|
||||
echo "LAT=${LAT}; LON=${LON}; UMAPNS=${UMAPNS}"
|
||||
rm ~/.zen/tmp/${MOATS}/GPS.json
|
||||
|
||||
## UNPLUG PLAYER DOCKER / SEE myos MODE
|
||||
[[ $USER == "zen" ]] && make player MAIL=$PLAYER DELETE=true
|
||||
### IPNS "$LAT" "$LON" KEY
|
||||
${MY_PATH}/tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/_ipns.priv "$LAT" "$LON"
|
||||
IMAPNS="/ipns/"$(ipfs key import ${MOATS} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/_ipns.priv)
|
||||
rm ~/.zen/tmp/${MOATS}/_ipns.priv
|
||||
### GET IMAPNS
|
||||
|
||||
#~ 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
|
||||
if [[ ${IMAPNS} != ${TWMAPNS} ]]; then
|
||||
echo "ERROR TW/GPS ERROR : IMAPNS ${IMAPNS}"
|
||||
echo " - MANUAL GPS SETTINGS NEEDED "
|
||||
echo "- CONTINUE -"
|
||||
else
|
||||
# Modifying UMAP
|
||||
echo "ipfs --timeout 42s get -o ~/.zen/tmp/${MOATS}/ ${TWMAPNS}/"
|
||||
ipfs --timeout 42s get -o ~/.zen/tmp/${MOATS}/ ${TWMAPNS}/
|
||||
## REMOVE PLAYER REFERENCES from UMAP
|
||||
rm -f ~/.zen/tmp/${MOATS}/*/_${PLAYER}.HPASS
|
||||
rm -f ~/.zen/tmp/${MOATS}/*${PLAYER}.asc
|
||||
rm -f ~/.zen/tmp/${MOATS}/*${PLAYER}.jpg
|
||||
rm -Rf ~/.zen/tmp/${MOATS}/TW/${PLAYER}
|
||||
## UPDATE IPFSROOT
|
||||
IPFSROOT=$(ipfs add -rwHq ~/.zen/tmp/${MOATS}/* | tail -n 1) && echo "NEW ROOT ${IPFSROOT}"
|
||||
## PUBLISH NEW UMAPNS
|
||||
ipfs name publish --key=${MOATS} /ipfs/${IPFSROOT}
|
||||
ipfs key rm ${MOATS} && echo "IPNS key identified"
|
||||
###
|
||||
fi
|
||||
|
||||
echo "PLAYER IPNS KEYS UNPLUGD"
|
||||
echo "rm -Rf ~/.zen/game/players/$PLAYER"
|
||||
rm -Rf ~/.zen/game/players/$PLAYER
|
||||
## REMOVING PLAYER from ASTROPORT
|
||||
ipfs key rm ${PLAYER}; ipfs key rm ${PLAYER}_feed; ipfs key rm ${G1PUB};
|
||||
for vk in $(ls -d ~/.zen/game/players/${PLAYER}/voeux/*/* | rev | cut -d / -f 1 | rev); do
|
||||
ipfs key rm ${vk}
|
||||
done
|
||||
|
||||
echo "PLAYER IPNS KEYS UNPLUGD"
|
||||
echo "rm -Rf ~/.zen/game/players/$PLAYER"
|
||||
rm -Rf ~/.zen/game/players/$PLAYER
|
||||
rm -Rf ~/.zen/tmp/${MOATS}
|
||||
|
||||
break
|
||||
;;
|
||||
|
|
@ -166,7 +201,6 @@ select fav in "${choices[@]}"; do
|
|||
${MY_PATH}/RUNTIME/G1Voeu.sh "" "$PLAYER" "$HOME/.zen/tmp/$PLAYER.html"
|
||||
DIFF=$(diff ~/.zen/game/players/$PLAYER/ipfs/moa/index.html ~/.zen/tmp/$PLAYER.html)
|
||||
if [[ $DIFF ]]; then
|
||||
MOATS=$(date -u +"%Y%m%d%H%M%S%4N")
|
||||
cp ~/.zen/game/players/$PLAYER/ipfs/moa/.chain \
|
||||
~/.zen/game/players/$PLAYER/ipfs/moa/.chain.$(cat ~/.zen/game/players/$PLAYER/ipfs/moa/.moats)
|
||||
|
||||
|
|
|
|||
|
|
@ -66,9 +66,9 @@ if [[ $SALT != "" && PEPPER != "" ]]; then
|
|||
if [ ! -s ~/.zen/tmp/${MOATS}/TW/index.html ]; then
|
||||
|
||||
ipfs key rm ${MOATS} 2>/dev/null ## CLEANING
|
||||
echo "CREATION TW Astronaute" ## Nouveau Compte Astronaute
|
||||
echo
|
||||
echo "***** Activation du Canal TW Astronaute ${PLAYER} *****"
|
||||
#~ echo "CREATION TW Astronaute" ## Nouveau Compte Astronaute
|
||||
#~ echo
|
||||
#~ echo "***** Activation du Canal TW Astronaute ${PLAYER} *****"
|
||||
cp ${MY_PATH}/../templates/twdefault.html ~/.zen/tmp/${MOATS}/TW/index.html
|
||||
|
||||
else
|
||||
|
|
@ -119,7 +119,7 @@ Adventure & Exploration P2P Terraforming Game.
|
|||
=============================================
|
||||
WELCOME 'Astronaute'"; # sleep 1
|
||||
|
||||
echo "Inscription..."
|
||||
#~ echo "Inscription..."
|
||||
|
||||
[[ $SALT == "" ]] && SALT=$(${MY_PATH}/diceware.sh 4 | xargs)
|
||||
echo "-> ID : $SALT"
|
||||
|
|
@ -328,7 +328,7 @@ DISCO="/?salt=${USALT}&pepper=${UPEPPER}"
|
|||
# Create"${PLAYER}_feed" Key ! DERIVATED ! "$SALT" "$G1PUB"
|
||||
${MY_PATH}/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/feed.ipfskey "$SALT" "$G1PUB"
|
||||
FEEDNS=$(ipfs key import "${PLAYER}_feed" -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/feed.ipfskey)
|
||||
echo ">>> RSS FEED : ${myIPFS}/ipns/${FEEDNS}/"
|
||||
|
||||
## MAKE LightBeam Plugin Tiddler ${PLAYER}_feed
|
||||
# $:/plugins/astroport/lightbeams/saver/ipns/lightbeam-key
|
||||
echo '[{"title":"$:/plugins/astroport/lightbeams/saver/ipns/lightbeam-name","text":"'${PLAYER}_feed'","tags":""}]' > ~/.zen/tmp/${MOATS}/lightbeam-name.json
|
||||
|
|
@ -341,11 +341,12 @@ DISCO="/?salt=${USALT}&pepper=${UPEPPER}"
|
|||
#~ echo ${ENCODING}
|
||||
echo '[{"title":"$:/plugins/astroport/lightbeams/saver/g1/lightbeam-natools-feed","text":"'${ENCODING}'","tags":""}]' > ~/.zen/tmp/${MOATS}/lightbeam-natools.json
|
||||
|
||||
echo "TW IPFS GATEWAY : ${NID}"
|
||||
echo
|
||||
echo "IPFS GATEWAY : ${NID}"
|
||||
#~ # cat ~/.zen/tmp/${MOATS}/local.gw.json | jq -r
|
||||
echo "TW IPFS API : ${WID}"
|
||||
echo "IPFS API : ${WID}"
|
||||
#~ # cat ~/.zen/tmp/${MOATS}/local.api.json | jq -r
|
||||
|
||||
echo ">>> RSS FEED : ${myIPFS}/ipns/${FEEDNS}"
|
||||
## CHANGE SELECTED GW & API
|
||||
|
||||
## ADD SYSTEM TW
|
||||
|
|
|
|||
Loading…
Reference in New Issue