diff --git a/zen/gchange_IPFS_swarm.sh b/zen/gchange_IPFS_swarm.sh index 3ba0230..a84a6dc 100755 --- a/zen/gchange_IPFS_swarm.sh +++ b/zen/gchange_IPFS_swarm.sh @@ -60,7 +60,7 @@ do && for peer in $(./jaklis.py read -n50 -j | jq -r --arg friendKEY "$liking_me" '.[] | select(.pubkey == $friendKEY)' | jq 'select(.title == "ipfstryme")' | jq -r '.content'); # 2. Searching "ipfstryme" message from friend_of_mine do - ip=$(echo "$peer" | awk -F '/' '{print $3}') + ip=$(echo "$peer" | awk -F '/' '{print $3}') && [[ $ip == "" ]] && continue || echo "Adding $ip to ~/.zen/A_allow_ip.txt" # Fill a file with friend of mine ip echo $ip >> ~/.zen/A_allow_ip.txt # Get its ipfsnodeid @@ -73,19 +73,18 @@ do ipfsadd=$((ipfsadd+1)) done; - if [[ $friend_of_mine != null]]; then + if [[ $friend_of_mine != null ]]; then if [[ $ipfsadd == 0 ]]; then # Friend of mine with no ipfstryme message (did not install astroport) - echo "No ipfstryme message..." + echo "No 'ipfstryme' message... from $liking_me" echo "$liking_me" >> ~/.zen/A_liking_me_NO_ipfstryme.txt - + else - echo "Delete OLD 'ipfstryme' messages from $liking_me" nbmessage=0 for messageid in $(./jaklis.py read -n50 -j | jq -r --arg friendKEY "$liking_me" '.[] | select(.pubkey == $friendKEY)' | jq -r '.id') do nbmessage=$((nbmessage+1)) - [ $nbmessage -gt 1 ] && ./jaklis.py delete -i $messageid + [ $nbmessage -gt 1 ] && echo "Delete OLD 'ipfstryme' messages from $liking_me" && ./jaklis.py delete -i $messageid done fi @@ -94,8 +93,9 @@ do # Automatic level_1 like from oasis.astroport.com (TODO add other default bootstrap) # TODO get $g1pub from ~/.zen/ipfs/.$IPFSNODEID/G1SSB/_g1.pubkey ?? # [[ $friend_of_mine == null && $G1PUB == "2jQUH4HfHxdTesjCjvMCx1VJgA5AnpuvrWRq1swfRdsS" ]] && ./jaklis.py like -p $g1pub -s 1 - + echo "__________________________________________" liking_me_count=$((liking_me_count+1)) + done @@ -110,7 +110,7 @@ echo for line in $(cat ~/.zen/A_liking_me_NO_ipfstryme.txt | uniq); do echo "Liking ME, but no ipfstryme received..." echo "cd ~/.zen/astroport/zen/jaklis" - echo "./jaklis.py send -d $liking_me -t 'Astroport' -m 'Rejoins mon #Swarm0 sur https://qo-op.com'" + echo "./jaklis.py send -d $line -t 'Astroport' -m 'Rejoins mon #Swarm0 installe https://astroport.com'" done cd -