Merge branch 'master' into fix
This commit is contained in:
commit
5da69c40b3
49
12345.sh
49
12345.sh
|
|
@ -5,7 +5,7 @@
|
|||
# License: AGPL-3.0 (https://choosealicense.com/licenses/agpl-3.0/)
|
||||
################################################################################
|
||||
################################################################################
|
||||
## ASTROPORT API SERVER http://$myHOST:1234
|
||||
## ASTROPORT API SERVER http://${myHOST}:1234
|
||||
## ATOMIC GET REDIRECT TO ONE SHOT WEB SERVICE THROUGH PORTS
|
||||
## ASYNCHRONOUS IPFS API
|
||||
################################################################################
|
||||
|
|
@ -13,9 +13,6 @@ MY_PATH="`dirname \"$0\"`" # relative
|
|||
MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized
|
||||
ME="${0##*/}"
|
||||
|
||||
shopt -s expand_aliases
|
||||
alias espeak='espeak 1>&2>/dev/null' ## SPEAKING LOG SHUT UP
|
||||
|
||||
MOATS=$(date -u +"%Y%m%d%H%M%S%4N")
|
||||
IPFSNODEID=$(cat ~/.ipfs/config | jq -r .Identity.PeerID)
|
||||
myIP=$(hostname -I | awk '{print $1}' | head -n 1)
|
||||
|
|
@ -34,7 +31,7 @@ mkdir -p ~/.zen/tmp/coucou/
|
|||
|
||||
## CHECK FOR ANY ALREADY RUNNING nc
|
||||
ncrunning=$(ps auxf --sort=+utime | grep -w 'nc -l -p 1234' | grep -v -E 'color=auto|grep' | tail -n 1 | cut -d " " -f 1)
|
||||
[[ $ncrunning ]] && echo "ERROR - API Server Already Running - ${myHTTP}$myHOST:1234/?salt=totodu56&pepper=totodu56&getipns " && exit 1
|
||||
[[ $ncrunning ]] && echo "ERROR - API Server Already Running - ${myHTTP}${myHOST}:1234/?salt=totodu56&pepper=totodu56&getipns " && exit 1
|
||||
## NOT RUNNING TWICE
|
||||
|
||||
# Some client needs to respect that
|
||||
|
|
@ -49,14 +46,14 @@ Content-Type: text/html; charset=UTF-8
|
|||
echo "_________________________________________________________"
|
||||
echo "LAUNCHING Astroport API Server - TUBE : $TUBE - "
|
||||
echo
|
||||
echo "NEW TW ${myHTTP}$myHOST:1234/?salt=totodu56&pepper=totodu56&g1pub=on&email=totodu56@yopmail.com"
|
||||
echo "NEW TW ${myHTTP}${myHOST}:1234/?salt=totodu56&pepper=totodu56&g1pub=on&email=totodu56@yopmail.com"
|
||||
echo
|
||||
echo "TW R/W MODE ${myHTTP}$myHOST:1234/?salt=totodu56&pepper=totodu56&official"
|
||||
echo "TW R/W MODE ${myHTTP}${myHOST}:1234/?salt=totodu56&pepper=totodu56&official"
|
||||
echo
|
||||
echo "GCHANGE MESSAGING ${myHTTP}$myHOST:1234/?salt=totodu56&pepper=totodu56&messaging"
|
||||
echo "OPEN GCHANGE ${myHTTP}$myHOST:1234/?salt=totodu56&pepper=totodu56&g1pub"
|
||||
echo "GCHANGE MESSAGING ${myHTTP}${myHOST}:1234/?salt=totodu56&pepper=totodu56&messaging"
|
||||
echo "OPEN GCHANGE ${myHTTP}${myHOST}:1234/?salt=totodu56&pepper=totodu56&g1pub"
|
||||
echo
|
||||
echo "TESTCRAFT ${myHTTP}$myHOST:1234/?salt=totodu56&pepper=totodu56&testcraft=on&nodeid=12D3KooWK1ACupF7RD3MNvkBFU9Z6fX11pKRAR99WDzEUiYp5t8j&dataid=QmPXhrqQrS1bePKJUPH9cJ2qe4RrNjaJdRXaJzSjxWuvDi"
|
||||
echo "TESTCRAFT ${myHTTP}${myHOST}:1234/?salt=totodu56&pepper=totodu56&testcraft=on&nodeid=12D3KooWK1ACupF7RD3MNvkBFU9Z6fX11pKRAR99WDzEUiYp5t8j&dataid=QmPXhrqQrS1bePKJUPH9cJ2qe4RrNjaJdRXaJzSjxWuvDi"
|
||||
echo "_________________________________________________________"
|
||||
|
||||
function urldecode() { : "${*//+/ }"; echo -e "${_//%/\\x}"; }
|
||||
|
|
@ -81,14 +78,14 @@ while true; do
|
|||
|
||||
## CHECK 12345 PORT RUNNING (STATION FoF MAP)
|
||||
maprunning=$(ps auxf --sort=+utime | grep -w '_12345.sh' | grep -v -E 'color=auto|grep' | tail -n 1 | cut -d " " -f 1)
|
||||
[[ ! $maprunning ]] && ($MY_PATH/_12345.sh &) && echo '(ᵔ◡◡ᵔ) LAUNCHING '${myHTTP}$myHOST:'12345 (ᵔ◡◡ᵔ)'
|
||||
[[ ! $maprunning ]] && ($MY_PATH/_12345.sh &) && echo '(ᵔ◡◡ᵔ) LAUNCHING '${myHTTP}${myHOST}:'12345 (ᵔ◡◡ᵔ)'
|
||||
|
||||
############### ACTIVATE USE ON QUICK IPFS DRIVE
|
||||
### CREATE IPNS KEY - ACTIVATE WHITH ENOUGH BOOTSTRAP
|
||||
#~ echo
|
||||
#~ ipfs key rm ${PORT} > /dev/null 2>&1
|
||||
#~ SESSIONNS=$(ipfs key gen ${PORT})
|
||||
#~ echo "IPNS SESSION ${myHTTP}$myHOSTPort/ipns/$SESSIONNS CREATED"
|
||||
#~ echo "IPNS SESSION ${myHTTP}${myHOST}Port/ipns/$SESSIONNS CREATED"
|
||||
|
||||
### # USE IT #
|
||||
### MIAM=$(echo ${PORT} | ipfs add -q)
|
||||
|
|
@ -102,8 +99,8 @@ while true; do
|
|||
|
||||
############### ############### ############### ############### templates/index.http
|
||||
# REPLACE myHOST in http response template (fixing next API meeting point)
|
||||
sed "s~127.0.0.1:12345~$myHOST:${PORT}~g" $HOME/.zen/Astroport.ONE/templates/index.http > ~/.zen/tmp/coucou/${MOATS}.myHOST.http
|
||||
sed -i "s~127.0.0.1~$myHOST~g" ~/.zen/tmp/coucou/${MOATS}.myHOST.http
|
||||
sed "s~127.0.0.1:12345~${myHOST}:${PORT}~g" $HOME/.zen/Astroport.ONE/templates/index.http > ~/.zen/tmp/coucou/${MOATS}.myHOST.http
|
||||
sed -i "s~127.0.0.1~${myHOST}~g" ~/.zen/tmp/coucou/${MOATS}.myHOST.http
|
||||
sed -i "s~:12345~:${PORT}~g" ~/.zen/tmp/coucou/${MOATS}.myHOST.http
|
||||
|
||||
sed -i "s~_SESSIONLNK_~${myHTTP}${myHOSTPort}/ipns/${SESSIONNS}~g" ~/.zen/tmp/coucou/${MOATS}.myHOST.http
|
||||
|
|
@ -127,7 +124,7 @@ while true; do
|
|||
echo "ASTROPORT 1234 UP & RUNNING.......................... ${myHTTP}$HOST:1234 PORT"
|
||||
echo "${MOATS} NEXT COMMAND DELIVERY PAGE ${myHTTP}$HOST:${PORT}"
|
||||
|
||||
espeak "Ding"
|
||||
espeak "Ding" >/dev/null 1>&2
|
||||
|
||||
echo "URL" > ~/.zen/tmp/coucou/${MOATS}.url ## LOGGING URL
|
||||
|
||||
|
|
@ -144,7 +141,7 @@ while true; do
|
|||
sed "s~http://127.0.0.1:1234~${myHTTP}$HOSTP~g" $HOME/.zen/Astroport.ONE/templates/register.html >> ~/.zen/tmp/coucou/${MOATS}.index.redirect
|
||||
sed -i "s~_IPFSNODEID_~${IPFSNODEID}~g" ~/.zen/tmp/coucou/${MOATS}.index.redirect
|
||||
sed -i "s~_HOSTNAME_~$(hostname)~g" ~/.zen/tmp/coucou/${MOATS}.index.redirect
|
||||
sed -i "s~http://127.0.0.1:8080~$(MyIPort)~g" ~/.zen/tmp/coucou/${MOATS}.index.redirect
|
||||
sed -i "s~http://127.0.0.1:8080~${myHTTP}${myHOSTPort}~g" ~/.zen/tmp/coucou/${MOATS}.index.redirect
|
||||
|
||||
|
||||
## Random Background image ;)
|
||||
|
|
@ -297,7 +294,7 @@ while true; do
|
|||
echo "GCHANGE REDIRECTING https://www.gchange.fr/#/app/user/"${G1PUB}"/"
|
||||
### REPONSE=$(echo https://www.gchange.fr/#/app/user/${G1PUB}/ | ipfs add -q)
|
||||
### ipfs name publish --allow-offline --key=${PORT} /ipfs/$REPONSE
|
||||
### echo "SESSION ${myHTTP}$myHOST:8080/ipns/$SESSIONNS "
|
||||
### echo "SESSION ${myHTTP}${myHOST}:8080/ipns/$SESSIONNS "
|
||||
(
|
||||
cat ~/.zen/tmp/coucou/${MOATS}.index.redirect | nc -l -p ${PORT} -q 1 > /dev/null 2>&1
|
||||
${MY_PATH}/tools/TW.cache.sh ${ASTRONAUTENS} ${MOATS}
|
||||
|
|
@ -471,10 +468,10 @@ echo "" > ~/.zen/tmp/.ipfsgw.bad.twt # TODO move in 20h12.sh
|
|||
$MY_PATH/tools/natools.py decrypt -f pubsec -k ~/.zen/tmp/coucou/${MOATS}.secret.key -i ~/.zen/tmp/myHOST.$G1PUB.enc.2 -o ~/.zen/tmp/myHOST.$G1PUB > /dev/null 2>&1
|
||||
GWIP=$(cat ~/.zen/tmp/myHOST.$G1PUB > /dev/null 2>&1)
|
||||
|
||||
[[ ! $GWIP ]] && GWIP=$myHOST ## CLEAR
|
||||
[[ ! $GWIP ]] && GWIP=${myHOST} ## CLEAR
|
||||
#
|
||||
echo "TW is on ${myHTTP}$GWIP"
|
||||
echo "BECOMING TW GATEWAY : $myHOST" ## BECOMING OFFICIAL BECOME R/W TW
|
||||
echo "BECOMING TW GATEWAY : ${myHOST}" ## BECOMING OFFICIAL BECOME R/W TW
|
||||
|
||||
####################
|
||||
echo $GWIP > ~/.zen/tmp/GWIP
|
||||
|
|
@ -487,12 +484,12 @@ echo "" > ~/.zen/tmp/.ipfsgw.bad.twt # TODO move in 20h12.sh
|
|||
###########################
|
||||
# Modification Tiddlers de contrôle de GW & API
|
||||
[[ $isLAN ]] \
|
||||
&& echo '[{"title":"$:/ipfs/saver/api/http/localhost/5001","tags":"$:/ipfs/core $:/ipfs/saver/api","text":"'${myHTTP}$myHOST':5001"}]' > ~/.zen/tmp/5001.json \
|
||||
&& echo '[{"title":"$:/ipfs/saver/gateway/http/localhost","tags":"$:/ipfs/core $:/ipfs/saver/gateway","text":"'${myHTTP}$myHOST':8080"}]' > ~/.zen/tmp/8080.json
|
||||
&& echo '[{"title":"$:/ipfs/saver/api/http/localhost/5001","tags":"$:/ipfs/core $:/ipfs/saver/api","text":"'${myHTTP}${myHOST}':5001"}]' > ~/.zen/tmp/5001.json \
|
||||
&& echo '[{"title":"$:/ipfs/saver/gateway/http/localhost","tags":"$:/ipfs/core $:/ipfs/saver/gateway","text":"'${myHTTP}${myHOST}':8080"}]' > ~/.zen/tmp/8080.json
|
||||
|
||||
[[ ! $isLAN ]] \
|
||||
&& echo '[{"title":"$:/ipfs/saver/api/http/localhost/5001","tags":"$:/ipfs/core $:/ipfs/saver/api","text":"'${myHTTP}$myHOST'/api"}]' > ~/.zen/tmp/5001.json \
|
||||
&& echo '[{"title":"$:/ipfs/saver/gateway/http/localhost","tags":"$:/ipfs/core $:/ipfs/saver/gateway","text":"'${myHTTP}$myHOST'"}]' > ~/.zen/tmp/8080.json
|
||||
&& echo '[{"title":"$:/ipfs/saver/api/http/localhost/5001","tags":"$:/ipfs/core $:/ipfs/saver/api","text":"'${myHTTP}${myHOST}'/api"}]' > ~/.zen/tmp/5001.json \
|
||||
&& echo '[{"title":"$:/ipfs/saver/gateway/http/localhost","tags":"$:/ipfs/core $:/ipfs/saver/gateway","text":"'${myHTTP}${myHOST}'"}]' > ~/.zen/tmp/8080.json
|
||||
|
||||
tiddlywiki --load ~/.zen/tmp/coucou/${MOATS}.astroindex.html \
|
||||
--import "$HOME/.zen/tmp/MadeInZion.json" "application/json" \
|
||||
|
|
@ -601,9 +598,9 @@ echo "" > ~/.zen/tmp/.ipfsgw.bad.twt # TODO move in 20h12.sh
|
|||
cat ~/.zen/tmp/${IPFSNODEID}/_timings | tail -n 1
|
||||
) &
|
||||
|
||||
echo "$HTTPCORS - <meta http-equiv='refresh' content='3; url=\"http://"$myHOST":8080/ipns/"$ASTRONAUTENS"\"'/>
|
||||
echo "$HTTPCORS - <meta http-equiv='refresh' content='3; url=\"http://"${myHOST}":8080/ipns/"$ASTRONAUTENS"\"'/>
|
||||
<h1>BOOTING - ASTRONAUT $PSEUDO </h1> IPFS FORMATING - [$SALT + $PEPPER] (${WHAT})
|
||||
<br>- TW - http://$myHOST:8080/ipns/$ASTRONAUTENS <br> - GW - /ipns/$IPFSNODEID" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &
|
||||
<br>- TW - http://${myHOST}:8080/ipns/$ASTRONAUTENS <br> - GW - /ipns/$IPFSNODEID" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &
|
||||
echo "(☓‿‿☓) Execution time was "`expr $end - $start` seconds.
|
||||
continue
|
||||
else
|
||||
|
|
@ -624,7 +621,7 @@ echo "" > ~/.zen/tmp/.ipfsgw.bad.twt # TODO move in 20h12.sh
|
|||
cat ~/.zen/tmp/coucou/${MOATS}.index.redirect | nc -l -p ${PORT} -q 1 > ~/.zen/tmp/coucou/${MOATS}.official.swallow &
|
||||
echo "HTTP 1.1 PROTOCOL DOCUMENT READY"
|
||||
cat ~/.zen/tmp/coucou/${MOATS}.index.redirect
|
||||
echo "${MOATS} -----> PAGE AVAILABLE -----> http://$myHOST:${PORT}"
|
||||
echo "${MOATS} -----> PAGE AVAILABLE -----> http://${myHOST}:${PORT}"
|
||||
|
||||
#echo "${ASTRONAUTENS}" | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ MY_PATH="`dirname \"$0\"`" # relative
|
|||
MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized
|
||||
ME="${0##*/}"
|
||||
start=`date +%s`
|
||||
echo "20H12 (♥‿‿♥) $(hostname)"
|
||||
echo "20H12 (♥‿‿♥) $(hostname) $(date)"
|
||||
espeak "Ding" > /dev/null 2>&1
|
||||
|
||||
|
||||
|
|
@ -35,7 +35,9 @@ git pull
|
|||
|
||||
## CLOSING 1234 API PORT
|
||||
killall 12345.sh
|
||||
killall _12345.sh
|
||||
killall nc
|
||||
killall tail
|
||||
|
||||
espeak "Ding Ding Ding" > /dev/null 2>&1
|
||||
|
||||
|
|
@ -45,7 +47,7 @@ espeak "Ding Ding Ding" > /dev/null 2>&1
|
|||
espeak "Bills Kills Bills" > /dev/null 2>&1
|
||||
|
||||
|
||||
## OPEN ENTRANCE AGAIN
|
||||
## OPEN API ENGINE
|
||||
~/.zen/Astroport.ONE/12345.sh > ~/.zen/tmp/12345.log &
|
||||
|
||||
if [[ ! $isLAN ]]; then
|
||||
|
|
@ -58,6 +60,9 @@ if [[ ! $isLAN ]]; then
|
|||
done
|
||||
fi
|
||||
|
||||
## Updating yt-dlp
|
||||
sudo youtube-dl -U
|
||||
|
||||
########################################################################
|
||||
end=`date +%s`
|
||||
echo "20H12 (♥‿‿♥) Execution time was "`expr $end - $start` seconds.
|
||||
|
|
|
|||
19
install.sh
19
install.sh
|
|
@ -202,12 +202,17 @@ echo '${TYPE};${MEDIAID};${YEAR};${TITLE};${SAISON};${GENRES};_IPNSKEY_;${RES};/
|
|||
#######################################################################
|
||||
|
||||
echo "#############################################"
|
||||
## https://darktrojan.github.io/openwith/webextension.html"
|
||||
[[ $XDG_SESSION_TYPE == 'x11' ]] && ~/.zen/Astroport.ONE/open_with_linux.py install; \
|
||||
|
||||
echo "# BLOB MODE avec 'OpenWith' depuis votre navigateur !!"
|
||||
## https://darktrojan.github.io/openwith/webextension.html"
|
||||
[[ $XDG_SESSION_TYPE == 'x11' ]] && ~/.zen/Astroport.ONE/open_with_linux.py install; \
|
||||
echo "#############################################" \
|
||||
echo "# NOURRIR SON BLOB" \
|
||||
echo "# avec 'OpenWith' depuis votre navigateur !!" \
|
||||
echo "# https://addons.mozilla.org/firefox/addon/open-with/
|
||||
# https://chrome.google.com/webstore/detail/open-with/cogjlncmljjnjpbgppagklanlcbchlno"
|
||||
# https://chrome.google.com/webstore/detail/open-with/cogjlncmljjnjpbgppagklanlcbchlno" \
|
||||
echo "#############################################" \
|
||||
echo \
|
||||
echo " ## $HOME/.zen/Astroport.ONE/ajouter_media.sh ##" \
|
||||
echo \
|
||||
echo "#############################################"
|
||||
|
||||
### ADD 20h12.sh CRON ###############
|
||||
|
|
@ -245,7 +250,7 @@ which youtube-dl
|
|||
echo "#############################################"
|
||||
echo "#############################################"
|
||||
## Desktop install
|
||||
echo "Astroport.ONE"
|
||||
echo "Astroport.ONE INSTALL"
|
||||
end=`date +%s`
|
||||
echo Execution time was `expr $end - $start` seconds.
|
||||
echo "#############################################"
|
||||
|
|
@ -267,7 +272,7 @@ Connectez-vous sur https://gchange.fr avec vos identifiants
|
|||
|
||||
$(cat ~/.zen/game/players/.current/secret.june)
|
||||
|
||||
http://astroport.com
|
||||
Powered by https://astroport.com
|
||||
"
|
||||
# MAIN #
|
||||
fi
|
||||
|
|
|
|||
2
start.sh
2
start.sh
|
|
@ -4,7 +4,7 @@
|
|||
# Version: 0.1
|
||||
# License: AGPL-3.0 (https://choosealicense.com/licenses/agpl-3.0/)
|
||||
################################################################################
|
||||
MY_PATH="`dirname \"$0\"`" # relative
|
||||
MY_PATH="`dirname \"$0\"`"
|
||||
MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized
|
||||
myIP=$(hostname -I | awk '{print $1}' | head -n 1)
|
||||
isLAN=$(echo $myIP | grep -E "/(^127\.)|(^192\.168\.)|(^10\.)|(^172\.1[6-9]\.)|(^172\.2[0-9]\.)|(^172\.3[0-1]\.)|(^::1$)|(^[fF][cCdD])/")
|
||||
|
|
|
|||
|
|
@ -142,7 +142,7 @@ do
|
|||
# # # # # # # # # # # # # # #
|
||||
## AUCUN VISA ASTRONAUTE ENVOYER UN MESSAGE PAR GCHANGE
|
||||
echo "AUCUN TW ACTIF. ENVOYONS LUI UN MESSAGE..."
|
||||
$MY_PATH/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dunikey -n "https://data.gchange.fr" send -d "${liking_me}" -t "SALUT. Je suis sur Astroport. Tu viens." -m "Active ton TW avec moi : http://libra.copylaradio.com:1234 - DEV MODE -"
|
||||
$MY_PATH/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dunikey -n "https://data.gchange.fr" send -d "${liking_me}" -t "BRO !" -m ">>> (◕‿‿◕) <<< https://astroport.copylaradio.com >>> (◕‿‿◕) <<<"
|
||||
|
||||
else
|
||||
|
||||
|
|
@ -175,8 +175,8 @@ do
|
|||
|
||||
else
|
||||
|
||||
echo "$my_star_level ETOILES RECUES ($gscore). Relayons sa politesse."
|
||||
$MY_PATH/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dunikey -n "https://data.gchange.fr" send -d "${G1PUB}" -t "$my_star_level ETOILES RECUES ($gscore)" -m "https://www.gchange.fr/#/app/user/${liking_me}/ VOTRE RETOUR ?"
|
||||
echo "$my_star_level ETOILES RECUES ($gscore). Etablir un lien retour."
|
||||
$MY_PATH/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dunikey -n "https://data.gchange.fr" send -d "${G1PUB}" -t "Bro ?" -m "https://www.gchange.fr/#/app/user/${liking_me}/"
|
||||
echo "LIKING LATER."
|
||||
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -198,10 +198,10 @@ G1PUB=$(cat /tmp/secret.dunikey | grep 'pub:' | cut -d ' ' -f 2)
|
|||
sed -i "s~127.0.0.1~$myIP~g" ~/.zen/game/players/$PLAYER/ipfs/moa/index.html # 8080 & 5001 BEING THE RECORDING GATEWAY (WAN or ipfs.localhost)
|
||||
|
||||
#
|
||||
echo "# CRYPTO ENCODING myIP -> CRYPTIP"
|
||||
echo "# CRYPTO ENCODING secret.dunikey -> TW _SECRET_ "
|
||||
echo $myIP > ~/.zen/tmp/myIP
|
||||
$MY_PATH/natools.py encrypt -p $G1PUB -i $HOME/.zen/tmp/myIP -o $HOME/.zen/tmp/myIP.$G1PUB.enc
|
||||
CRYPTIP=$(cat ~/.zen/tmp/myIP.$G1PUB.enc | base16)
|
||||
$MY_PATH/natools.py encrypt -p $G1PUB -i $HOME/.zen/game/players/$PLAYER/secret.dunikey -o $HOME/.zen/tmp/secret.dunikey.$G1PUB.enc
|
||||
CRYPTIP=$(cat ~/.zen/tmp/secret.dunikey.$G1PUB.enc | base16)
|
||||
sed -i "s~_SECRET_~$CRYPTIP~g" ~/.zen/game/players/$PLAYER/ipfs/moa/index.html
|
||||
#
|
||||
echo "# CRYPTO DECODING CRYPTIP -> myIP"
|
||||
|
|
@ -279,10 +279,10 @@ echo "*** IPNS Ŋ0 KEY : $PLAYER";
|
|||
echo; echo "GW : http://$myIP:8080/ipns/${ASTRONAUTENS}"; sleep 1
|
||||
|
||||
# PASS CRYPTING KEY
|
||||
echo; echo "Sécurisation de vos clefs par chiffrage SSL... "; sleep 1
|
||||
openssl enc -aes-256-cbc -salt -in "$HOME/.zen/game/players/$PLAYER/secret.june" -out "$HOME/.zen/game/players/$PLAYER/enc.secret.june" -k $PASS 2>/dev/null
|
||||
openssl enc -aes-256-cbc -salt -in "$HOME/.zen/game/players/$PLAYER/secret.dunikey" -out "$HOME/.zen/game/players/$PLAYER/enc.secret.dunikey" -k $PASS 2>/dev/null
|
||||
openssl enc -aes-256-cbc -salt -in "$HOME/.zen/game/players/$PLAYER/$KEYFILE -out" "$HOME/.zen/game/players/$PLAYER/enc.$KEYFILE" -k $PASS 2>/dev/null
|
||||
#~ echo; echo "Sécurisation de vos clefs... "; sleep 1
|
||||
#~ openssl enc -aes-256-cbc -salt -in "$HOME/.zen/game/players/$PLAYER/secret.june" -out "$HOME/.zen/game/players/$PLAYER/enc.secret.june" -k $PASS 2>/dev/null
|
||||
#~ openssl enc -aes-256-cbc -salt -in "$HOME/.zen/game/players/$PLAYER/secret.dunikey" -out "$HOME/.zen/game/players/$PLAYER/enc.secret.dunikey" -k $PASS 2>/dev/null
|
||||
#~ openssl enc -aes-256-cbc -salt -in "$HOME/.zen/game/players/$PLAYER/$KEYFILE -out" "$HOME/.zen/game/players/$PLAYER/enc.$KEYFILE" -k $PASS 2>/dev/null
|
||||
## TODO MORE SECURE ?! USE opengpg, natools, etc ...
|
||||
# ${MY_PATH}/natools.py encrypt -p $G1PUB -i ~/.zen/game/players/$PLAYER/secret.dunikey -o "$HOME/.zen/game/players/$PLAYER/enc.secret.dunikey"
|
||||
echo
|
||||
|
|
|
|||
|
|
@ -26,6 +26,9 @@ $(basename "$0") old scraping"
|
|||
exit 2
|
||||
}
|
||||
|
||||
# IPFSNODEID=$(ipfs id -f='<id>\n')
|
||||
IPFSNODEID=$(cat ~/.ipfs/config | jq -r .Identity.PeerID)
|
||||
mkdir -p ~/.zen/tmp/${IPFSNODEID}/uqload_downloader/
|
||||
|
||||
## CHOOSE kodi.${OLD}log
|
||||
[[ $1 == "old" ]] && OLD='old.' || OLD=''
|
||||
|
|
@ -41,44 +44,26 @@ do
|
|||
echo "########################################################################"
|
||||
echo "MANUAL : uqload_downloader https://uqload.com/$uqlink \"$HOME/Astroport/$uqname.mp4\""
|
||||
|
||||
## ADD TO ASTROPORT
|
||||
# IPFSNODEID=$(ipfs id -f='<id>\n')
|
||||
IPFSNODEID=$(cat ~/.ipfs/config | jq -r .Identity.PeerID)
|
||||
NODEG1PUB=$(${MY_PATH}/ipfs_to_g1.py ${IPFSNODEID})
|
||||
mkdir -p ~/.zen/tmp/${IPFSNODEID}/uqload_downloader/
|
||||
|
||||
## CREATE APPNAME IPNS KEY (CREATE ONE BY FRIENDS SHARING COPY TASK) HACKING_QUEST TODO Make a better key generation
|
||||
[[ ! -f ~/.zen/tmp/${IPFSNODEID}/uqload_downloader/keygen.ipns.key.enc.b16 ]] \
|
||||
&& ${MY_PATH}/keygen -t ipfs -o ~/.zen/tmp/publish.key "$uqlink" "$IPFSNODEID" \
|
||||
&& ${MY_PATH}/natools.py encrypt -p ${NODEG1PUB} -i ~/.zen/tmp/publish.key -o ~/.zen/tmp/${IPFSNODEID}/uqload_downloader/keygen.ipns.key.enc \
|
||||
&& cat ~/.zen/tmp/${IPFSNODEID}/uqload_downloader/keygen.ipns.key.enc | base16 > ~/.zen/tmp/${IPFSNODEID}/uqload_downloader/keygen.ipns.key.enc.b16
|
||||
|
||||
[[ ! $(cat ~/.zen/tmp/${IPFSNODEID}/uqload_downloader/commands.fifo | grep -w "$uqname.mp4") ]] && \
|
||||
! cat ~/.zen/tmp/${IPFSNODEID}/uqload_downloader/commands.fifo | grep -w "$uqname.mp4" && \
|
||||
echo "uqload_downloader https://uqload.com/$uqlink \"$HOME/Astroport/$uqname.mp4\"" >> ~/.zen/tmp/${IPFSNODEID}/uqload_downloader/commands.fifo || \
|
||||
echo "$uqname.mp4 conflict"
|
||||
|
||||
## CHECK & MANAGE COPY
|
||||
if [[ $(find $HOME/astroport -name "$uqname*" -type f -print) ]];
|
||||
if [[ $(find $HOME/Astroport -name "$uqname*" -type f -print) ]];
|
||||
then
|
||||
echo "COPY ALREADY IN $HOME/Astroport/"
|
||||
continue
|
||||
else
|
||||
echo "DETECTED MOVIE : $uqname (https://uqload.com/$uqlink)"
|
||||
echo "WANT TO COPY ? Yes? Write any character + enter, else just hit enter."
|
||||
read YESNO
|
||||
if [[ "$YESNO" != "" ]]; then
|
||||
## COPY STREAMING
|
||||
echo "DETECTED MOVIE : $uqname (https://uqload.com/$uqlink)"
|
||||
uqload_downloader https://uqload.com/$uqlink "$HOME/Astroport/$uqname.mp4"
|
||||
echo "COPY ~/Astroport/$uqname.mp4 DONE"
|
||||
## ARE WE ASTROPORT STATION? https://astroport.com
|
||||
[[ "$USER" != "xbian" && ${IPFSNODEID} ]] && ~/.zen/astrXbian/ajouter_video.sh
|
||||
else
|
||||
continue
|
||||
fi
|
||||
echo "COPY ~/astroport/$uqname.mp4 DONE"
|
||||
## ARE WE RUNNING ON ASTROPORT STATION?
|
||||
[[ ${IPFSNODEID} && -d ~/.zen/Astroport.ONE/ ]] && ~/.zen/Astroport.ONE/ajouter_media.sh
|
||||
fi
|
||||
done
|
||||
echo
|
||||
echo "########################################################################"
|
||||
[[ $cycle == 1 && ! ${OLD} ]] && echo "NOTHING IN CURRENT LOG, TRY old ?" && read OLD && [[ "$OLD" != "" ]] && $MY_PATH/$SCRIPT old
|
||||
echo "DONE... VideoClub Datacenter Virtuel entre amis. https://copylaradio.com"
|
||||
echo "DONE... VideoClub Datacenter Virtuel entre amis."
|
||||
echo "ASTROPORT. Le web des gens."
|
||||
exit 0
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/bash
|
||||
########################################################################
|
||||
MY_PATH="`dirname \"$0\"`" # relative
|
||||
MY_PATH="`dirname \"$0\"`"
|
||||
MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized
|
||||
ME="${0##*/}"
|
||||
######## YOUTUBE-DL ##########
|
||||
|
|
|
|||
Loading…
Reference in New Issue