From d744beb884bd07e083ba12cda17400f217a55774 Mon Sep 17 00:00:00 2001 From: fred Date: Mon, 19 Dec 2022 18:26:03 +0100 Subject: [PATCH] API 1234 PLAYER ONBOARDING + AppName=pay /?salt=${SALT}&pepper=${PEPPER}&pay=$MONTANT&to=$G1PUB --- 12345.sh | 23 +++++++++++++++++++++-- install.sh | 20 +++++++++----------- templates/register.html | 15 +++++++-------- 3 files changed, 37 insertions(+), 21 deletions(-) diff --git a/12345.sh b/12345.sh index 4786f9ac..f6f4eba2 100755 --- a/12345.sh +++ b/12345.sh @@ -18,7 +18,7 @@ IPFSNODEID=$(cat ~/.ipfs/config | jq -r .Identity.PeerID) myIP=$(hostname -I | awk '{print $1}' | head -n 1) isLAN=$(route -n |awk '$1 == "0.0.0.0" {print $2}' | grep -E "/(^127\.)|(^192\.168\.)|(^10\.)|(^172\.1[6-9]\.)|(^172\.2[0-9]\.)|(^172\.3[0-1]\.)|(^::1$)|(^[fF][cCdD])/") -myDOMAINName=$(hostname -d 2>/dev/null) && [ -z "$myDOMAINName" ] && myDOMAINName=$(domainname 2>/dev/null) +myDOMAINName=$(hostname -d 2>/dev/null) && [ -z "$myDOMAINName" ] && myDOMAINName=$(domainname 2>/dev/null) && [[ "$myDOMAINName" == "(none)" ]] && myDOMAINName="localhost" myHOSTName=$(hostname |sed 's/\.'${myDOMAINName}'$//') [ -n "$myDOMAINName" ] && myHOSTName="${myHOSTName}.${myDOMAINName}" || myDOMAINName=${myHOSTName#*.} [ -z "$myDOMAINName" ] && myDOMAINName=localhost @@ -183,6 +183,9 @@ while true; do APPNAME=$(urldecode ${arr[4]} | xargs) WHAT=$(urldecode ${arr[5]} | xargs) + OBJ=$(urldecode ${arr[6]} | xargs) + VAL=$(urldecode ${arr[7]} | xargs) + ########## CHECK GET PARAM NAMES ################################################################################################### [[ ${arr[0]} == "" || ${arr[1]} == "" ]] && (echo "$HTTPCORS ERROR - MISSING DATA" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) && continue @@ -251,7 +254,22 @@ while true; do ######################################## ## APPNAME SELECTION ######################## ######################################## - # MESSAGING + +############################################## +# PAY +############################################## + if [[ $APPNAME == "pay" ]]; then + echo "$APPNAME : $WHAT $OBJ $VAL" + echo "$HTTPCORS $(${MY_PATH}/tools/jaklis/jaklis.py -k ~/.zen/tmp/coucou/${MOATS}.secret.key -a ${WHAT} -p ${VAL} -c 'Bro')" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 & + end=`date +%s` + echo "(G_G ) PAYING Execution time was "`expr $end - $start` seconds. + continue + fi + + +############################################## +# MESSAGING +############################################## if [[ $APPNAME == "messaging" || $APPNAME == "email" ]]; then ( ## & SUB PROCESS @@ -447,6 +465,7 @@ echo "" > ~/.zen/tmp/.ipfsgw.bad.twt # TODO move in 20h12.sh continue fi + ############################################## # GETIPNS ############################################## diff --git a/install.sh b/install.sh index 56b23dd3..4cb3ae65 100755 --- a/install.sh +++ b/install.sh @@ -270,25 +270,21 @@ echo "#############################################" echo Execution time was `expr $end - $start` seconds. echo "#############################################" echo "%%%%%%%%%%%%%%%%%%%%" -echo "VOUS AVEZ DEJA UN COMPTE SUR GCHANGE ?" +echo "SI VOUS AVEZ DEJA UN COMPTE SUR GCHANGE ?" echo " Saisissez vos identifiants" echo "%%%%%%%%%%%%%%%%%%%%" -echo -echo "Sinon Tapez 2 fois sur ENTRER." -read SALT -[[ $SALT ]] && echo "Entrez votre mot de passe : " -read PEPPER -[[ $SALT && ! $PEPPER ]] && SALT="" - - ~/.zen/Astroport.ONE/tools/VISA.new.sh "$SALT" "$PEPPER" - echo "#############################################" if [[ $XDG_SESSION_TYPE == 'x11' ]]; then ########################################################## -echo "EXPERIMENTAL ### INIT KODI PAR IPFS ## " + ## ON BOARDING PLAYER + ~/.zen/Astroport.ONE/start.sh & + xdg-open "http://astroport.localhost:1234" + +echo "EXPERIMENTAL ### RECOPIEZ VOS VSTREAM KODI DANS IPFS ## " read KODI if [[ $KODI ]]; then + mkdir -p ~/.zen/tmp/kodi echo "PATIENTEZ..." ipfs get -o ~/.zen/tmp/kodi/ /ipfs/Qmc763hnsuTqSTDBNagmzca4fSzmcTp9kHoeosaPKC8QvK @@ -303,6 +299,8 @@ read KODI cd $MY_PATH fi + + fi else diff --git a/templates/register.html b/templates/register.html index bf04129e..acdea55d 100644 --- a/templates/register.html +++ b/templates/register.html @@ -2,7 +2,7 @@ - [Astroport] TW :: Station _HOSTNAME_ (_IPFSNODEID_) + [Astroport] :: Station _HOSTNAME_ :: _IPFSNODEID_ @@ -41,13 +41,12 @@ html { --- Welkom - Mirë se vini - Willkommen - Welkomma - Welcome - Marhaban - Bari galoust - Xos gelmissiniz - Welkum - Ongi etorri- Swagata - Ansuf yiswen - ščyra zaprašajem - Kyo tzo pa eit - Ani kié - Dobro došli - Dagemer mat - Dobre doshŭl - Benvinguts - Ulihebisdi - Huān yíng - Karibu - Eoso eoseyo - Benvenuti - Bel bonjou - Bienvini - Dobrodošli - Velkommen - Bienvenido - Bonvenon - Tere tulemast - Gabitê - Vælkomin - Tervetuloa - Welkom - Wìllkòmme - Binvignut - Fàilte - Benvido - Croeso - Planvenguda - Mikouabô - Kalos irthate - -Eguahé porá - Baroukh habaim - ... ----

Astroport

-

Internet Reboot !
Inscrivez-vous
@@ -60,9 +59,9 @@ html {
@@ -108,7 +107,7 @@ Take possession of your TW. Make freedom of expression uncensurable, unstoppable
- Made In Zion _\/_ powered by "Astroport" + Made In Zion funded project _\/_ powered by "Astroport"