far better now
This commit is contained in:
parent
66811e7a0a
commit
fec61bf5a5
|
|
@ -166,15 +166,16 @@ UMAPNS=$(ipfs key import ${G1PUB} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/_ip
|
|||
echo "UMAPNS : ${myIPFS}/ipns/${UMAPNS}"
|
||||
|
||||
## ALL TEST PASSED -> CREATE ZENCARD + ASTROID
|
||||
NPASS=$(echo "${RANDOM}${RANDOM}${RANDOM}${RANDOM}" | tail -c-9) ## NOUVEAU PASS 8 CHIFFRES
|
||||
PPASS=$(head /dev/urandom | tr -dc 'A-Za-z0-9' | head -c 4) ## STRONGER TW SECURITY "AlpH4nUm"
|
||||
NPASS=$(head /dev/urandom | tr -dc 'A-Za-z0-9' | head -c 10) ## STRONGER TW SECURITY "AlpH4nUm"
|
||||
|
||||
#~ NPASS=$(echo "${RANDOM}${RANDOM}${RANDOM}${RANDOM}" | tail -c-9) ## NOUVEAU PASS 8 CHIFFRES
|
||||
#~ NPASS=$(head /dev/urandom | tr -dc 'A-Za-z0-9' | head -c 10) ## STRONGER TW SECURITY "AlpH4nUm"
|
||||
#~ PPASS=$(head /dev/urandom | tr -dc 'A-Za-z0-9' | head -c 2)
|
||||
PPASS=$(${MY_PATH}/../tools/diceware.sh $(${MY_PATH}/../tools/getcoins_from_gratitude_box.sh) | xargs)
|
||||
NPASS=$(${MY_PATH}/../tools/diceware.sh $(${MY_PATH}/../tools/getcoins_from_gratitude_box.sh) | xargs)
|
||||
## CREATE ASTRONAUTE TW ON CURRENT ASTROPORT
|
||||
(
|
||||
echo VISA.new.sh "${EMAIL}_${PPASS}" "${NPASS}" "${EMAIL}" "UPlanet" "/ipns/${UMAPNS}" "${LAT}" "${LON}"
|
||||
echo VISA.new.sh "${PPASS}" "${NPASS}" "${EMAIL}" "UPlanet" "/ipns/${UMAPNS}" "${LAT}" "${LON}"
|
||||
##### (☉_☉ ) #######
|
||||
${MY_PATH}/../RUNTIME/VISA.new.sh "${EMAIL}_${PPASS}" "${NPASS}" "${EMAIL}" "UPlanet" "/ipns/${UMAPNS}" "${LAT}" "${LON}" >> ~/.zen/tmp/email.${EMAIL}.${MOATS}.txt
|
||||
${MY_PATH}/../RUNTIME/VISA.new.sh "${PPASS}" "${NPASS}" "${EMAIL}" "UPlanet" "/ipns/${UMAPNS}" "${LAT}" "${LON}" >> ~/.zen/tmp/email.${EMAIL}.${MOATS}.txt
|
||||
|
||||
## TO REMOVE : MONITOR
|
||||
${MY_PATH}/../tools/mailjet.sh "support@qo-op.com" ~/.zen/tmp/email.${EMAIL}.${MOATS}.txt "LOG VISA.new $EMAIL" ## Send VISA.new log to EMAIL
|
||||
|
|
@ -186,7 +187,7 @@ echo "(TW REGISTRATION) Operation time was "`expr $end - $start` seconds.
|
|||
|
||||
########################################
|
||||
## Calculating TW IPNS ADDRESS
|
||||
TWADD=$(${MY_PATH}/../tools/keygen -t ipfs "${EMAIL}_${PPASS}" "${NPASS}")
|
||||
TWADD=$(${MY_PATH}/../tools/keygen -t ipfs "${PPASS}" "${NPASS}")
|
||||
|
||||
## HTTP nc ON PORT RESPONSE
|
||||
echo "$HTTPCORS
|
||||
|
|
@ -216,10 +217,10 @@ echo "$HTTPCORS
|
|||
</style>
|
||||
</head><body>
|
||||
<h1>UPlanet Registration</h1>
|
||||
Your AstroID seeds are:<br>
|
||||
${EMAIL} AstroID seeds are:<br>
|
||||
<br>
|
||||
<h2>${EMAIL}_${PPASS}</h2>
|
||||
<h1>${NPASS}</h1>
|
||||
<h2>${PPASS}</h2>
|
||||
<h2>${NPASS}</h2>
|
||||
|
||||
Generating account...
|
||||
<br>Please check your mail box to get your ZenCard and PIN code.
|
||||
|
|
|
|||
|
|
@ -281,6 +281,7 @@ for PLAYER in ${PLAYERONE[@]}; do
|
|||
echo "Create CESIUM Tiddler"
|
||||
cat ${MY_PATH}/../templates/data/CESIUM.json \
|
||||
| sed -e "s~_G1PUB_~${G1PUB}~g" \
|
||||
-e "s~_MOATS_~${MOATS}~g" \
|
||||
-e "s~_CESIUMIPFS_~${CESIUMIPFS}~g" \
|
||||
-e "s~_PLAYER_~${PLAYER}~g" \
|
||||
> ~/.zen/tmp/${MOATS}/CESIUM.json
|
||||
|
|
|
|||
|
|
@ -563,7 +563,7 @@ echo "<html><head>
|
|||
}
|
||||
</style></head>
|
||||
<body>
|
||||
<h1>UPlanet : ZenCard + <a href='${myIPFS}/ipns/${ASTRONAUTENS}'>TW</a></h1>" > ~/.zen/tmp/${MOATS}/ZenCard.html
|
||||
<h1>UPlanet : <a href='${myIPFS}/ipns/${ASTRONAUTENS}'>TW</a></h1>" > ~/.zen/tmp/${MOATS}/ZenCard.html
|
||||
asciiart="${MY_PATH}/../images/astroport.art"
|
||||
while IFS= read -r line
|
||||
do
|
||||
|
|
@ -571,8 +571,8 @@ do
|
|||
echo "<br>" >> ~/.zen/tmp/${MOATS}/ZenCard.html
|
||||
done <"$asciiart"
|
||||
|
||||
echo "<h2>PRINT & SHARE <a href='${myIPFS}/ipns/${ASTRONAUTENS}#ZenCard' title='${G1PUB}'>ZenCard</a></h2>
|
||||
<img src='${myIPFSGW}${IASTRO}'\><br>
|
||||
echo "<br><img src='${myIPFSGW}${IASTRO}'\>
|
||||
<h2>PRINT & SHARE <a href='${myIPFS}/ipns/${ASTRONAUTENS}#ZenCard' title='${G1PUB}'>ZenCard</a></h2>
|
||||
</body></html>" >> ~/.zen/tmp/${MOATS}/ZenCard.html
|
||||
|
||||
$MY_PATH/../tools/mailjet.sh "${PLAYER}" ~/.zen/tmp/${MOATS}/ZenCard.html "ZenCard (${PLAYER}) "
|
||||
|
|
|
|||
38
command.sh
38
command.sh
|
|
@ -12,6 +12,8 @@ TS=$(date -u +%s%N | cut -b1-13)
|
|||
MOATS=$(date -u +"%Y%m%d%H%M%S%4N")
|
||||
#~ mkdir -p ~/.zen/tmp/${MOATS}
|
||||
|
||||
CURRENT=$(cat ~/.zen/game/players/.current/.player)
|
||||
|
||||
echo '
|
||||
_ ____ _____ ____ ___ ____ ___ ____ _____ ___ _ _ _____
|
||||
/ \ / ___|_ _| _ \ / _ \| _ \ / _ \| _ \_ _| / _ \| \ | | ____|
|
||||
|
|
@ -19,14 +21,12 @@ echo '
|
|||
/ ___ \ ___) || | | _ <| |_| | __/| |_| | _ < | | | |_| | |\ | |___
|
||||
/_/ \_\____/ |_| |_| \_\\___/|_| \___/|_| \_\|_| \___/|_| \_|_____|
|
||||
|
||||
Ambassade numérique pair à pair sur IPFS.
|
||||
Astroport is a Web3 engine running UPlanet hosting TW5s on IPFS, and more...
|
||||
|
||||
@@@@@@@@@@@@@@@@@@
|
||||
ASTROPORT
|
||||
VISA : MadeInZion
|
||||
DRAGON = ${CURRENT}
|
||||
@@@@@@@@@@@@@@@@@@'
|
||||
CURRENT=$(cat ~/.zen/game/players/.current/.player)
|
||||
echo "CURRENT = ${CURRENT}"
|
||||
echo
|
||||
|
||||
## VERIFY SOFTWARE DEPENDENCIES
|
||||
|
|
@ -37,7 +37,7 @@ YOU=$(myIpfsApi);
|
|||
echo 'PRESS ENTER... '; read
|
||||
|
||||
## CREATE AND OR CONNECT USER
|
||||
PS3='DRAGON connectez votre PLAYER ___ '
|
||||
PS3=' ____ Select ___ ? '
|
||||
players=( "CREATE PLAYER" "IMPORT PLAYER" "PRINT QRCARD" $(ls ~/.zen/game/players | grep "@" 2>/dev/null))
|
||||
## MULTIPLAYER
|
||||
|
||||
|
|
@ -67,17 +67,21 @@ select fav in "${players[@]}"; do
|
|||
echo "'Email ?'"
|
||||
read EMAIL
|
||||
[[ ${EMAIL} == "" ]] && break
|
||||
echo "'Latitude (precision 0.01°) ?'"
|
||||
echo "'Secret 1'"
|
||||
read PPASS
|
||||
[[ ${PPASS} == "" ]] \
|
||||
&& PPASS=$(${MY_PATH}/tools/diceware.sh $(${MY_PATH}/tools/getcoins_from_gratitude_box.sh) | xargs)
|
||||
echo "'Secret 2'"
|
||||
read NPASS
|
||||
[[ ${NPASS} == "" ]] \
|
||||
&& NPASS=$(${MY_PATH}/tools/diceware.sh $(${MY_PATH}/tools/getcoins_from_gratitude_box.sh) | xargs)
|
||||
echo "'Latitude ?'"
|
||||
read LAT
|
||||
[[ ${LAT} == "" ]] && LAT="0.00"
|
||||
echo "'Longitude ?'"
|
||||
read LON
|
||||
[[ ${LON} == "" ]] && LON="0.00"
|
||||
|
||||
PPASS=$(head /dev/urandom | tr -dc 'A-Za-z0-9' | head -c 4) ## STRONGER TW SECURITY "AlpH4nUm"
|
||||
NPASS=$(head /dev/urandom | tr -dc 'A-Za-z0-9' | head -c 10) ## STRONGER TW SECURITY "AlpH4nUm"
|
||||
|
||||
${MY_PATH}/RUNTIME/VISA.new.sh "${EMAIL}_${PPASS}" "${NPASS}" "${EMAIL}" "UPlanet" "_URL_" "${LAT}" "${LON}"
|
||||
${MY_PATH}/RUNTIME/VISA.new.sh "${PPASS}" "${NPASS}" "${EMAIL}" "UPlanet" "_URL_" "${LAT}" "${LON}"
|
||||
fav=$(cat ~/.zen/tmp/PSEUDO 2>/dev/null) && rm ~/.zen/tmp/PSEUDO
|
||||
echo "Astronaute $fav bienvenue sur UPlanet..."
|
||||
exit
|
||||
|
|
@ -112,7 +116,7 @@ PLAYER=$fav
|
|||
|
||||
pass=$(cat ~/.zen/game/players/$PLAYER/.pass 2>/dev/null)
|
||||
########################################## DEVEL
|
||||
echo "Saisissez votre PASS -- UPGRADE CRYPTO FREELY -- $pass" && read PASS
|
||||
echo "Saisissez votre PASS -- FREE MODE -- $pass" && read PASS
|
||||
|
||||
## DECODE CURRENT PLAYER CRYPTO
|
||||
# echo "********* DECODAGE SecuredSocketLayer *********"
|
||||
|
|
@ -121,11 +125,11 @@ echo "Saisissez votre PASS -- UPGRADE CRYPTO FREELY -- $pass" && read PASS
|
|||
[[ $PASS != $pass ]] && echo "ERROR. MAUVAIS PASS. EXIT" && exit 1
|
||||
|
||||
## CURRENT CHANGE ?
|
||||
[[ ${CURRENT} != ${PLAYER} ]] \
|
||||
&& echo "BECOME ADMIN ? hit ENTER for NO, write something for YES" && read ADM \
|
||||
&& [[ ${ADM} != "" ]] \
|
||||
&& rm -f ~/.zen/game/players/.current \
|
||||
&& ln -s ~/.zen/game/players/${PLAYER} ~/.zen/game/players/.current
|
||||
#~ [[ ${CURRENT} != ${PLAYER} ]] \
|
||||
#~ && echo "BECOME ADMIN ? hit ENTER for NO, write something for YES" && read ADM \
|
||||
#~ && [[ ${ADM} != "" ]] \
|
||||
#~ && rm -f ~/.zen/game/players/.current \
|
||||
#~ && ln -s ~/.zen/game/players/${PLAYER} ~/.zen/game/players/.current
|
||||
|
||||
echo "________LOGIN OK____________";
|
||||
echo
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
[
|
||||
{
|
||||
"created": "_MOATS_",
|
||||
"title": "CESIUM",
|
||||
"text": "<iframe src='_CESIUMIPFS_/#/app/wot/tx/_G1PUB_/' height='480' width='100%'></iframe>",
|
||||
"text": "<iframe src='_CESIUMIPFS_/#/app/wot/tx/_G1PUB_/' height='560' width='100%'></iframe>",
|
||||
"tags": "_PLAYER_",
|
||||
"type": "text/vnd.tiddlywiki"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,18 +0,0 @@
|
|||
#!/bin/bash
|
||||
# GET AND COMBINE ALL JSON IN DIRECTORY
|
||||
DIR="$1"
|
||||
|
||||
## COMBINE ALL JSON
|
||||
json_array=()
|
||||
# Loop through each *.rss.json file and append its content to the array
|
||||
for file in ${DIR}/*.rss.json; do
|
||||
# Use jq to extract the JSON array from each file
|
||||
data=$(jq '.' "$file")
|
||||
json_array+=("$data")
|
||||
done
|
||||
temp_file=$(mktemp)
|
||||
printf '%s\n' "${json_array[@]}" > "$temp_file"
|
||||
# Use jq to read the array from the temporary file and create the merged JSON
|
||||
jq -n --slurpfile array "$temp_file" '{"data": $array}' > ${DIR}/.all.json
|
||||
# Remove the temporary file
|
||||
rm "$temp_file"
|
||||
|
|
@ -420,8 +420,12 @@ myAstroTube() {
|
|||
function makecoord() {
|
||||
local input="$1"
|
||||
|
||||
input=$(echo "${input}" | sed 's/\([0-9]*\.[0-9]\{2\}\).*/\1/') # Ensure has exactly two decimal places
|
||||
|
||||
if [[ ${input} =~ ^-?[0-9]+\.[0-9]$ ]]; then
|
||||
input="${input}0"
|
||||
elif [[ ${input} =~ ^-?[0-9]+\.$ ]]; then
|
||||
input="${input}00"
|
||||
elif [[ ${input} =~ ^-?[0-9]+$ ]]; then
|
||||
input="${input}.00"
|
||||
fi
|
||||
|
|
|
|||
Loading…
Reference in New Issue