diff --git a/ISOconfig.sh b/ISOconfig.sh index cc5aab07f..757b1263f 100755 --- a/ISOconfig.sh +++ b/ISOconfig.sh @@ -119,11 +119,11 @@ echo "$XZUID" > ~/.zen/ipfs/.${IPFSNODEID}/_xbian.zuid ######################################################################## echo "CREATING GCHANGE+/CESIUM+ PROFILE" ######################################################################## -~/.zen/astrXbian/zen/jaklis/jaklis.py -n "https://data.gchange.fr" set --name "$XZUID" --avatar "/home/$USER/.zen/astrXbian/logo.png" #GCHANGE+ -~/.zen/astrXbian/zen/jaklis/jaklis.py -n "https://g1.data.e-is.pro" set --name "$XZUID" --avatar "/home/$USER/.zen/astrXbian/logo.png" #CESIUM+ +~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey -n "https://data.gchange.fr" set --name "$XZUID" --avatar "/home/$USER/.zen/astrXbian/logo.png" #GCHANGE+ +~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey -n "https://g1.data.e-is.pro" set --name "$XZUID" --avatar "/home/$USER/.zen/astrXbian/logo.png" #CESIUM+ ### DELETE -# ~/.zen/astrXbian/zen/jaklis/jaklis.py -n "https://g1.data.e-is.pro" erase -# ~/.zen/astrXbian/zen/jaklis/jaklis.py -n "https://data.gchange.fr" erase +# ~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey -n "https://g1.data.e-is.pro" erase +# ~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey -n "https://data.gchange.fr" erase ######################################################################## ######################################################################## @@ -133,11 +133,11 @@ for g1node in $(cat ~/.zen/astrXbian/A_boostrap_nodes.txt | grep -Ev "#") # remo do if [[ "$g1node" != "" ]]; then echo "SENDING STAR TO BOOTSTRAP NODE : $g1node" - ~/.zen/astrXbian/zen/jaklis/jaklis.py -n "https://g1.data.e-is.pro" stars -p $g1node -n 1 - ~/.zen/astrXbian/zen/jaklis/jaklis.py -n "https://data.gchange.fr" stars -p $g1node -n 1 + ~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey -n "https://g1.data.e-is.pro" stars -p $g1node -n 1 + ~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey -n "https://data.gchange.fr" stars -p $g1node -n 1 ### DELETE - # ~/.zen/astrXbian/zen/jaklis/jaklis.py -n "https://g1.data.e-is.pro" unstars -p $g1node - # ~/.zen/astrXbian/zen/jaklis/jaklis.py -n "https://data.gchange.fr" unstars -p $g1node + # ~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey -n "https://g1.data.e-is.pro" unstars -p $g1node + # ~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey -n "https://data.gchange.fr" unstars -p $g1node fi done @@ -192,8 +192,8 @@ for g1node in $(cat ~/.zen/astrXbian/A_boostrap_nodes.txt | grep -Ev "#") # remo do if [[ $g1node != "" ]]; then echo "SENDING ipfstryme to BOOTSTRAP node : $g1node" -# ~/.zen/astrXbian/zen/jaklis/jaklis.py -n "https://g1.data.le-sou.org" send -d $g1node -t "ipfstryme" -f ~/.zen/ipfs/.${IPFSNODEID}/tryme.addr - ~/.zen/astrXbian/zen/jaklis/jaklis.py send -d $g1node -t "ipfstryme" -f ~/.zen/ipfs/.${IPFSNODEID}/tryme.addr +# ~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey -n "https://g1.data.le-sou.org" send -d $g1node -t "ipfstryme" -f ~/.zen/ipfs/.${IPFSNODEID}/tryme.addr + ~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey send -d $g1node -t "ipfstryme" -f ~/.zen/ipfs/.${IPFSNODEID}/tryme.addr fi done diff --git a/zen/gchange_INIT.sh b/zen/gchange_INIT.sh index 2f9cb8797..8ff29ca85 100755 --- a/zen/gchange_INIT.sh +++ b/zen/gchange_INIT.sh @@ -120,22 +120,22 @@ fi ################## AUTO PINNING -for liking_me in $(~/.zen/astrXbian/zen/jaklis/jaklis.py stars | jq -r '.likes[].issuer' && cat ~/.zen/astrXbian/A_boostrap_nodes.txt | grep -Ev "#"); +for liking_me in $(~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey stars | jq -r '.likes[].issuer' && cat ~/.zen/astrXbian/A_boostrap_nodes.txt | grep -Ev "#"); do # BOOTSTRAP AUTO LIKE BACK (NOT liking Myself) if [[ "$IamBOOTSTRAP" == "$G1PUB" ]]; then echo "I AM A BOOTSTRAP AUTO LIKING $liking_me FRIEND" if [[ ! -f ~/.zen/ipfs/.${IPFSNODEID}/FRIENDS/$liking_me/tryme.addr && "$liking_me" != "$G1PUB" ]]; then echo "SENDING 1 STAR AUTO LIKE to $liking_me" - /home/$YOU/.zen/astrXbian/zen/jaklis/jaklis.py unstars -p $liking_me + /home/$YOU/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey unstars -p $liking_me sleep $((1 + RANDOM % 2)) # SLOW DOWN - /home/$YOU/.zen/astrXbian/zen/jaklis/jaklis.py stars -p $liking_me -n 1 + /home/$YOU/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey stars -p $liking_me -n 1 sleep $((1 + RANDOM % 2)) # SLOW DOWN fi fi # CHECKING IF WE LIKE EACH OTHER (AVOID LIKING MYSELF) - friend_of_mine=$(~/.zen/astrXbian/zen/jaklis/jaklis.py stars -p $liking_me | jq -r '.yours'); + friend_of_mine=$(~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey stars -p $liking_me | jq -r '.yours'); if [[ "$friend_of_mine" != "null" && "$liking_me" != "$G1PUB" ]] then # ADD $liking_me TO MY ipfs FRIENDS list @@ -145,7 +145,7 @@ do then echo "I AM $G1PUB" echo "Sending IPFSTRYME message to $liking_me" - ~/.zen/astrXbian/zen/jaklis/jaklis.py send -d $liking_me -t "ipfstryme" -f ~/.zen/ipfs/.${IPFSNODEID}/tryme.addr + ~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey send -d $liking_me -t "ipfstryme" -f ~/.zen/ipfs/.${IPFSNODEID}/tryme.addr else echo "tryme.addr MESSAGE ALREADY SEND TO $liking_me" fi diff --git a/zen/gchange_IPFS_swarm.sh b/zen/gchange_IPFS_swarm.sh index d64933c2f..8fc39419a 100755 --- a/zen/gchange_IPFS_swarm.sh +++ b/zen/gchange_IPFS_swarm.sh @@ -30,7 +30,7 @@ echo $(date) # Let's look for Friends and "IPFS swarm connect" with them ######################################################################## # 1. Get Gchange "liking_me" people list -for liking_me in $(~/.zen/astrXbian/zen/jaklis/jaklis.py stars | jq -r '.likes[].issuer'); +for liking_me in $(~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey stars | jq -r '.likes[].issuer'); do [[ "$liking_me" == "" || "$liking_me" == "$G1PUB" ]] && continue # DE TOUS CEUX QUI M'AIMENT JE VAIS LIRE LES MESSAGES pour collecter leurs ipfstryme vers ~/.zen/A_swarm_map.txt @@ -39,7 +39,7 @@ do liking_me_count=$((liking_me_count+1)) echo ">>>>>> CHECKING my friend n° $liking_me_count" echo "READING 'ipfstryme' message from $liking_me" - for peerline in $(~/.zen/astrXbian/zen/jaklis/jaklis.py read -n300 -j | jq -r --arg friendKEY "$liking_me" '.[] | select(.pubkey == $friendKEY)' | jq 'select(.title == "ipfstryme")' | jq -r '.content'); + for peerline in $(~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey read -n300 -j | jq -r --arg friendKEY "$liking_me" '.[] | select(.pubkey == $friendKEY)' | jq 'select(.title == "ipfstryme")' | jq -r '.content'); do echo "" echo "PEERLINE: $peerline" @@ -53,7 +53,7 @@ do [[ "$ipfsnodeid" == "" ]] && continue whoisg1=$(~/.zen/astrXbian/zen/tools/ipfs_to_g1.py $ipfsnodeid) echo "AM I FRIEND WITH MY FRIEND FRIEND $whoisg1 ?" - friend_of_mine=$(~/.zen/astrXbian/zen/jaklis/jaklis.py stars -p $whoisg1 | jq -r '.yours.pseudo'); # must contains my XZUID + friend_of_mine=$(~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey stars -p $whoisg1 | jq -r '.yours.pseudo'); # must contains my XZUID if [[ "$friend_of_mine" != "null" ]]; then echo "YEAH IT IS ALSO MY FRIEND !!!" @@ -69,18 +69,18 @@ do fi # REMOVING OLD ipfstryme MESSAGES nbmessage=0 - for messageid in $(~/.zen/astrXbian/zen/jaklis/jaklis.py read -n50 -j | jq -r --arg friendKEY "$whoisg1" '.[] | select(.pubkey == $friendKEY)' | jq 'select(.title == "ipfstryme")' | jq -r '.id') + for messageid in $(~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey read -n50 -j | jq -r --arg friendKEY "$whoisg1" '.[] | select(.pubkey == $friendKEY)' | jq 'select(.title == "ipfstryme")' | jq -r '.id') do nbmessage=$((nbmessage+1)) - [ $nbmessage -gt 1 ] && echo "Delete $nbmessage OLD 'ipfstryme' messages from $whoisg1" && ~/.zen/astrXbian/zen/jaklis/jaklis.py delete -i $messageid + [ $nbmessage -gt 1 ] && echo "Delete $nbmessage OLD 'ipfstryme' messages from $whoisg1" && ~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey delete -i $messageid sleep 0.5 done [[ $nbmessage == 0 ]] && echo "NO ipfstryme MESSAGE FROM THIS FRIEND $whoisg1" - # SEND MESSAGE ~/.zen/astrXbian/zen/jaklis/jaklis.py send -d $whoisg1 -t 'Astroport' -m 'Aucun message de ta part https://copylaradio.com'" + # SEND MESSAGE ~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey send -d $whoisg1 -t 'Astroport' -m 'Aucun message de ta part https://copylaradio.com'" else echo "NOT FULL FRIEND $ipfsnodeid / $whoisg1" # SEND ME A MESSAGE TO DECIDE WHAT TO DO ? - # SEND MESSAGE ~/.zen/astrXbian/zen/jaklis/jaklis.py send -d $whoisg1 -t 'Astroport' -m 'Rejoins mon #Swarm0 https://copylaradio.com'" + # SEND MESSAGE ~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey send -d $whoisg1 -t 'Astroport' -m 'Rejoins mon #Swarm0 https://copylaradio.com'" fi done; diff --git a/zen/new_file_in_astroport.sh b/zen/new_file_in_astroport.sh index f1efc40df..3676b2578 100755 --- a/zen/new_file_in_astroport.sh +++ b/zen/new_file_in_astroport.sh @@ -98,7 +98,7 @@ then # DELETING GCHANGE AD, WILL BE CREATED AGAIN gchangeAD=$(cat ~/.zen/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/.gchange.ad) - ~/.zen/astrXbian/zen/jaklis/jaklis.py deleteoffer -i $gchangeAD + ~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey deleteoffer -i $gchangeAD rm ~/.zen/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/.gchange.ad else echo "FILE IS ALREADY EXISTING FROM ANOTHER FRIEND" @@ -180,7 +180,7 @@ if [[ "${CAT}" =~ ^(film|serie|anime)$ ]] then if [[ ! -f ~/.zen/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/.gchange.ad ]] then - GOFFER=$(~/.zen/astrXbian/zen/jaklis/jaklis.py setoffer -t "${TITLE} #astroport #${INDEXPREFIX}${REFERENCE}" -d "https://aries.copylaradio.com/ipns/$IPNS/ = https://www.themoviedb.org/movie/${REFERENCE}" -p ~/.zen/astrXbian/disk.png) + GOFFER=$(~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey setoffer -t "${TITLE} #astroport #${INDEXPREFIX}${REFERENCE}" -d "https://aries.copylaradio.com/ipns/$IPNS/ = https://www.themoviedb.org/movie/${REFERENCE}" -p ~/.zen/astrXbian/disk.png) echo $GOFFER > ~/.zen/KEY/${INDEXPREFIX}${REFERENCE}/${G1PUB}/.gchange.ad NEWIPFS=$(ipfs add -rHq ~/.zen/KEY/${INDEXPREFIX}${REFERENCE}/ | tail -n 1 ) IPNS=$(ipfs name publish --quieter --key="${INDEXPREFIX}${REFERENCE}" $NEWIPFS) diff --git a/zen/ssh_forward2onelove.sh b/zen/ssh_forward2onelove.sh index 216393591..c56c50033 100755 --- a/zen/ssh_forward2onelove.sh +++ b/zen/ssh_forward2onelove.sh @@ -32,7 +32,7 @@ then ## SEND MESSAGE echo "ipfs p2p close -p /x/$G1PUB-ssh" > /tmp/ssh.forward - ~/.zen/astrXbian/zen/jaklis/jaklis.py send -d Ee1n3hDv9vunfd6m3LW6XeYg7bnt5aaRn9EjqnBe8GNS -t "SSH-STOP" -f /tmp/ssh.forward + ~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey send -d Ee1n3hDv9vunfd6m3LW6XeYg7bnt5aaRn9EjqnBe8GNS -t "SSH-STOP" -f /tmp/ssh.forward echo "STOP" fi if [[ "$ARG" == "" || "$ARG" == "open" ]]; then @@ -42,7 +42,7 @@ then PORT="109${RANDOM:0:2}" # RANDOM PORT echo "ipfs p2p forward /x/$G1PUB-ssh /ip4/127.0.0.1/tcp/$PORT /p2p/$IPFSNODEID ssh $USER@localhost -p $PORT" > /tmp/ssh.forward - ~/.zen/astrXbian/zen/jaklis/jaklis.py send -d Ee1n3hDv9vunfd6m3LW6XeYg7bnt5aaRn9EjqnBe8GNS -t "SSH-OPEN" -f /tmp/ssh.forward + ~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey send -d Ee1n3hDv9vunfd6m3LW6XeYg7bnt5aaRn9EjqnBe8GNS -t "SSH-OPEN" -f /tmp/ssh.forward echo "Demande de dépannage envoyé à fred@ONELOVE (Ee1n3hDv9vunfd6m3LW6XeYg7bnt5aaRn9EjqnBe8GNS)" fi fi