diff --git a/API/UPLANET.sh b/API/UPLANET.sh index 9cc9dfd7..6af7321e 100755 --- a/API/UPLANET.sh +++ b/API/UPLANET.sh @@ -167,15 +167,14 @@ 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 2) ## STRONGER TW SECURITY "AlpH4nUm" -DPASS=$(head /dev/urandom | tr -dc 'A-Za-z0-9' | head -c 2) ## STRONGER TW SECURITY "AlpH4nUm" +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" ## CREATE ASTRONAUTE TW ON CURRENT ASTROPORT ( -echo VISA.new.sh "${EMAIL}_${PPASS}_${DPASS}" "${NPASS}" "${EMAIL}" "UPlanet" "/ipns/${UMAPNS}" "${LAT}" "${LON}" +echo VISA.new.sh "${EMAIL}_${PPASS}" "${NPASS}" "${EMAIL}" "UPlanet" "/ipns/${UMAPNS}" "${LAT}" "${LON}" ##### (☉_☉ ) ####### -${MY_PATH}/../RUNTIME/VISA.new.sh "${EMAIL}_${PPASS}_${DPASS}" "${NPASS}" "${EMAIL}" "UPlanet" "/ipns/${UMAPNS}" "${LAT}" "${LON}" >> ~/.zen/tmp/email.${EMAIL}.${MOATS}.txt +${MY_PATH}/../RUNTIME/VISA.new.sh "${EMAIL}_${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 @@ -187,7 +186,7 @@ echo "(TW REGISTRATION) Operation time was "`expr $end - $start` seconds. ######################################## ## Calculating TW IPNS ADDRESS -TWADD=$(${MY_PATH}/../tools/keygen -t ipfs "${EMAIL}_${PPASS}_${DPASS}" "${NPASS}") +TWADD=$(${MY_PATH}/../tools/keygen -t ipfs "${EMAIL}_${PPASS}" "${NPASS}") ## HTTP nc ON PORT RESPONSE echo "$HTTPCORS @@ -219,7 +218,7 @@ echo "$HTTPCORS

UPlanet Registration

Your AstroID seeds are:

-

${EMAIL}_${PPASS}_${DPASS}

+

${EMAIL}_${PPASS}

${NPASS}

Generating account... diff --git a/RUNTIME/SECTOR.refresh.sh b/RUNTIME/SECTOR.refresh.sh index 1d9bba88..550567b0 100755 --- a/RUNTIME/SECTOR.refresh.sh +++ b/RUNTIME/SECTOR.refresh.sh @@ -274,8 +274,8 @@ echo "${TODATE -e "s~_UPZONENS_~${TODATEREGIONNS}~g" \ -e "s~_SECTORG1PUB_~${G1PUB}~g" \ -e "s~_PHONEBOOTH_~${PHONEBOOTH}~g" \ - -e "s~_LAT_~${REGLAT}~g" \ - -e "s~_LON_~${REGLON}~g" \ + -e "s~_LAT_~${SECLAT}~g" \ + -e "s~_LON_~${SECLON}~g" \ -e "s~_EARTHCID_~${EARTHCID}~g" \ -e "s~_DATE_~$(date +%A-%d_%m_%Y)~g" \ -e "s~_UPLANETLINK_~${EARTHCID}/map_render.html\?southWestLat=${REGLAT}\&southWestLon=${REGLON}\°=1~g" \ diff --git a/RUNTIME/VISA.new.sh b/RUNTIME/VISA.new.sh index 32e4faff..1c9a13d9 100755 --- a/RUNTIME/VISA.new.sh +++ b/RUNTIME/VISA.new.sh @@ -565,7 +565,7 @@ echo "

TW

ZenCard

" >> ~/.zen/tmp/${MOATS}/ZenCard.html -$MY_PATH/../tools/mailjet.sh "${PLAYER}" ~/.zen/tmp/${MOATS}/ZenCard.html "ZenCard ${PLAYER} " +$MY_PATH/../tools/mailjet.sh "${PLAYER}" ~/.zen/tmp/${MOATS}/ZenCard.html "ZenCard (${PLAYER}) " #~ mpack -a -s "✅ UPlanet : ZenCard" -d ~/.zen/tmp/${MOATS}/intro.txt \ #~ ~/.zen/tmp/${MOATS}/pseudo.png ${PLAYER} @@ -593,14 +593,14 @@ do done <"$asciiart" echo " -

* 0.1 ${SECTOR} ${DEMAINDATE}

+

> 0.1 SECTOR : ${SECTOR} > ${DEMAINDATE}


AstroID

SECRET1=$SALT SECRET2=$PEPPER ($PASS)
-

ASTROPORT : NODE#${IPFSNODEID}

+

ASTROPORT : NODE#${IPFSNODEID}

Uplanet " >> ~/.zen/tmp/${MOATS}/AstroID.html -$MY_PATH/../tools/mailjet.sh "${PLAYER}" ~/.zen/tmp/${MOATS}/AstroID.html "AstroID ${PLAYER} " +$MY_PATH/../tools/mailjet.sh "${PLAYER}" ~/.zen/tmp/${MOATS}/AstroID.html "AstroID (${PLAYER}) " #~ mpack -a -s "✅ UPlanet : AstroID ($PASS)" -d ~/.zen/tmp/${MOATS}/intro.txt \ #~ $HOME/.zen/game/players/${PLAYER}/AstroID.png ${PLAYER} diff --git a/install.sh b/install.sh index c33030fd..97a50645 100755 --- a/install.sh +++ b/install.sh @@ -23,7 +23,7 @@ start=`date +%s` && echo "bash <(wget -qO- https://git.p2p.legal/qo-op/Astroport.ONE/raw/branch/master/kubo_v0.20.0_linux.install.sh)" \ && architecture=$(uname -m) && [[ $architecture == "x86_64" || $architecture == "aarch64" || "$architecture" == "armv7l" ]] \ && bash <(wget -qO- https://raw.githubusercontent.com/papiche/Astroport.ONE/master/kubo_v0.20.0_linux.install.sh) \ -|| echo "=== Installez IPFS KUBO puis relancez Install ===" +|| echo "=== IPFS FOUND === OK" [[ ! $(which ipfs) ]] && echo "INSTALL IPFS PLEASE" && exit 1 #################################################################### TEST