git pull
This commit is contained in:
parent
2eed37ee2e
commit
b27444bd71
3
12345.sh
3
12345.sh
|
@ -132,7 +132,8 @@ while true; do
|
||||||
## / CONTACT
|
## / CONTACT
|
||||||
if [[ $URL == "/" ]]; then
|
if [[ $URL == "/" ]]; then
|
||||||
echo "/ CONTACT : $HOSTP"
|
echo "/ CONTACT : $HOSTP"
|
||||||
|
echo "$HTTPCORS
|
||||||
|
DING $(date)" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &
|
||||||
end=`date +%s`
|
end=`date +%s`
|
||||||
echo " (‿/‿) $myHOST:$PORT / Execution time was "`expr $end - $start` seconds.
|
echo " (‿/‿) $myHOST:$PORT / Execution time was "`expr $end - $start` seconds.
|
||||||
continue
|
continue
|
||||||
|
|
|
@ -42,18 +42,16 @@ PLAYER="$2"
|
||||||
CHOICE="$3"
|
CHOICE="$3"
|
||||||
|
|
||||||
# Check who is .current PLAYER
|
# Check who is .current PLAYER
|
||||||
[[ ${PLAYER} == "" ]] && PLAYER=$(myPlayer)
|
|
||||||
|
|
||||||
[[ ${PLAYER} == "" ]] \
|
[[ ${PLAYER} == "" ]] \
|
||||||
&& players=($(ls ~/.zen/game/players 2>/dev/null)) \
|
&& players=($(ls ~/.zen/game/players | grep -Ev "localhost" 2>/dev/null)) \
|
||||||
&& espeak "PLEASE CONNECT A PLAYER" \
|
&& espeak "PLEASE CONNECT A PLAYER" \
|
||||||
&& OUTPUT=$(zenity --entry --width 640 --title="=> Astroport" --text="ASTRONAUTE ?" --entry-text=${players[@]}) \
|
&& OUTPUT=$(zenity --entry --width 640 --title="=> Astroport" --text="ASTRONAUTE ?" --entry-text=${players[@]}) \
|
||||||
&& [[ $OUTPUT ]] && PLAYER=$OUTPUT && rm -f ~/.zen/game/players/.current && ln -s ~/.zen/game/players/$PLAYER ~/.zen/game/players/.current
|
&& [[ $OUTPUT ]] && PLAYER=$OUTPUT && rm -f ~/.zen/game/players/.current && ln -s ~/.zen/game/players/$PLAYER ~/.zen/game/players/.current
|
||||||
|
|
||||||
[[ ${PLAYER} == "" ]] \
|
[[ ${PLAYER} == "" ]] \
|
||||||
&& ${MY_PATH}/start.sh \
|
&& ${MY_PATH}/start.sh \
|
||||||
&& espeak "Astroport Empty. Enter your magic email" \
|
&& espeak "Astroport Empty. Create your TW" \
|
||||||
&& xdg-open "https://qo-op.com" \
|
&& xdg-open "http://astroport.localhost" \
|
||||||
&& exit 1
|
&& exit 1
|
||||||
|
|
||||||
PSEUDO=$(myPlayerPseudo)
|
PSEUDO=$(myPlayerPseudo)
|
||||||
|
|
|
@ -164,7 +164,7 @@ YUSER=$(echo $PLAYER | cut -d '@' -f1) # YUSER=geg-la_debrouille
|
||||||
LYUSER=($(echo "$YUSER" | sed 's/[^a-zA-Z0-9]/\ /g')) # LYUSER=(geg la debrouille)
|
LYUSER=($(echo "$YUSER" | sed 's/[^a-zA-Z0-9]/\ /g')) # LYUSER=(geg la debrouille)
|
||||||
CLYUSER=$(printf '%s\n' "${LYUSER[@]}" | tac | tr '\n' '.' ) # CLYUSER=debrouille.la.geg.
|
CLYUSER=$(printf '%s\n' "${LYUSER[@]}" | tac | tr '\n' '.' ) # CLYUSER=debrouille.la.geg.
|
||||||
YOMAIN=$(echo $PLAYER | cut -d '@' -f 2) # YOMAIN=super.chez-moi.com
|
YOMAIN=$(echo $PLAYER | cut -d '@' -f 2) # YOMAIN=super.chez-moi.com
|
||||||
echo "NEXT STYLE GW : https://ipfs.$CLYUSER$YOMAIN.$(myHostName)"
|
# echo "NEXT STYLE GW : https://ipfs.$CLYUSER$YOMAIN.$(myHostName)"
|
||||||
# echo "MY PLAYER API GW : $(myPlayerApiGw)"
|
# echo "MY PLAYER API GW : $(myPlayerApiGw)"
|
||||||
|
|
||||||
NID="${myIPFS}"
|
NID="${myIPFS}"
|
||||||
|
@ -173,9 +173,6 @@ WID="https://ipfs.$CLYUSER$YOMAIN.$(myHostName)/api"
|
||||||
[[ $isLAN ]] && NID="http://astroport.localhost:8080" \
|
[[ $isLAN ]] && NID="http://astroport.localhost:8080" \
|
||||||
&& WID="http://astroport.localhost:5001"
|
&& WID="http://astroport.localhost:5001"
|
||||||
|
|
||||||
#### player ipfs docker
|
|
||||||
echo "[[ $USER == 'zen' ]] && make player MAIL=$(myPlayer) USER_HOST=$(myPlayerHost)"
|
|
||||||
|
|
||||||
####
|
####
|
||||||
|
|
||||||
### CREATE $NID ADDRESS FOR API & ROUND ROBIN FOR GW
|
### CREATE $NID ADDRESS FOR API & ROUND ROBIN FOR GW
|
||||||
|
@ -277,10 +274,10 @@ echo "[[ $USER == 'zen' ]] && make player MAIL=$(myPlayer) USER_HOST=$(myPlayerH
|
||||||
echo '[{"title":"$:/plugins/astroport/lightbeams/saver/ipns/lightbeam-name","text":"'${PLAYER}_feed'","tags":""}]' > ~/.zen/tmp/${MOATS}/lightbeam-name.json
|
echo '[{"title":"$:/plugins/astroport/lightbeams/saver/ipns/lightbeam-name","text":"'${PLAYER}_feed'","tags":""}]' > ~/.zen/tmp/${MOATS}/lightbeam-name.json
|
||||||
echo '[{"title":"$:/plugins/astroport/lightbeams/saver/ipns/lightbeam-key","text":"'${FEEDNS}'","tags":""}]' > ~/.zen/tmp/${MOATS}/lightbeam-key.json
|
echo '[{"title":"$:/plugins/astroport/lightbeams/saver/ipns/lightbeam-key","text":"'${FEEDNS}'","tags":""}]' > ~/.zen/tmp/${MOATS}/lightbeam-key.json
|
||||||
|
|
||||||
echo "TW IPFS GATEWAY"
|
echo "TW IPFS GATEWAY : $NID"
|
||||||
cat ~/.zen/tmp/${MOATS}/local.gw.json | jq -r
|
# cat ~/.zen/tmp/${MOATS}/local.gw.json | jq -r
|
||||||
echo "TW IPFS API"
|
echo "TW IPFS API : $WID"
|
||||||
cat ~/.zen/tmp/${MOATS}/local.api.json | jq -r
|
# cat ~/.zen/tmp/${MOATS}/local.api.json | jq -r
|
||||||
|
|
||||||
## ADD SYSTEM TW
|
## ADD SYSTEM TW
|
||||||
tiddlywiki --load ~/.zen/game/players/$PLAYER/ipfs/moa/index.html \
|
tiddlywiki --load ~/.zen/game/players/$PLAYER/ipfs/moa/index.html \
|
||||||
|
@ -340,8 +337,8 @@ echo "[[ $USER == 'zen' ]] && make player MAIL=$(myPlayer) USER_HOST=$(myPlayerH
|
||||||
|
|
||||||
echo "${ASTRONAUTENS}" > ~/.zen/game/players/$PLAYER/.playerns
|
echo "${ASTRONAUTENS}" > ~/.zen/game/players/$PLAYER/.playerns
|
||||||
|
|
||||||
echo "$SALT" > ~/.zen/game/players/$PLAYER/secret.june
|
echo "SALT=$SALT" > ~/.zen/game/players/$PLAYER/secret.june
|
||||||
echo "$PEPPER" >> ~/.zen/game/players/$PLAYER/secret.june
|
echo "PEPPER=$PEPPER" >> ~/.zen/game/players/$PLAYER/secret.june
|
||||||
|
|
||||||
echo; echo "Création Clefs et QR codes pour accès au niveau Astroport Ŋ1"; sleep 1
|
echo; echo "Création Clefs et QR codes pour accès au niveau Astroport Ŋ1"; sleep 1
|
||||||
|
|
||||||
|
@ -352,7 +349,13 @@ echo; echo "+ RSS : ${myIPFS}/ipns/${FEEDNS}"; sleep 1
|
||||||
|
|
||||||
[[ $XDG_SESSION_TYPE == 'x11' ]] && xdg-open "${myIPFS}/ipns/${ASTRONAUTENS}"
|
[[ $XDG_SESSION_TYPE == 'x11' ]] && xdg-open "${myIPFS}/ipns/${ASTRONAUTENS}"
|
||||||
|
|
||||||
[[ ! -L ~/.zen/game/players/.current ]] && ln -s ~/.zen/game/players/$PLAYER ~/.zen/game/players/.current
|
################# PREPARE DOCKERIZATION
|
||||||
|
rm ~/.zen/game/players/.current
|
||||||
|
ln -s ~/.zen/game/players/$PLAYER ~/.zen/game/players/.current
|
||||||
|
. "$MY_PATH/my.sh"
|
||||||
|
|
||||||
|
#### make player ipfs docker
|
||||||
|
[[ ! $isLAN || $USER == 'zen' ]] && make player MAIL=$(myPlayer) USER_HOST=$(myPlayerHost)
|
||||||
|
|
||||||
# PASS CRYPTING KEY
|
# PASS CRYPTING KEY
|
||||||
#~ echo; echo "Sécurisation de vos clefs... "; sleep 1
|
#~ echo; echo "Sécurisation de vos clefs... "; sleep 1
|
||||||
|
|
Loading…
Reference in New Issue