From fdf3ccc9de517bfd9fc6a8b00b2e3b2dd2d467d9 Mon Sep 17 00:00:00 2001
From: qo-op <support@qo-op.com>
Date: Fri, 25 Dec 2020 19:52:08 +0100
Subject: [PATCH] ~/.zen/ipfs_swarm/ SYNC

---
 zen/gchange_IPFS_swarm.sh | 14 +++++++-------
 zen/ipfs_SWARM_refresh.sh |  9 +++++----
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/zen/gchange_IPFS_swarm.sh b/zen/gchange_IPFS_swarm.sh
index 8adf70a..3b82e93 100755
--- a/zen/gchange_IPFS_swarm.sh
+++ b/zen/gchange_IPFS_swarm.sh
@@ -9,6 +9,8 @@ MY_PATH="`( cd \"$MY_PATH\" && pwd )`"  # absolutized and normalized
 ME="${0##*/}"
 
 # create swarm_map and my_swam files
+echo "" > ~/.zen/A_my_swarm.txt
+echo "" > ~/.zen/A_swram_map.txt
 
 ########################################################################
 # ENVIRONEMENT DETECTION + IPFS ~/.zen/ipfs/.$IPFSNODEID/G1SSB/_info
@@ -21,8 +23,6 @@ isIPFSRunning=$(ps auxf --sort=+utime | grep -w ipfs | grep -v -E 'color=auto|gr
 
 # Force Strict #swarm0 !!?
 # ipfs bootstrap rm --all
-echo "" > ~/.zen/A_my_swarm.txt
-echo "" > ~/.zen/A_swram_map.txt
 liking_me_count=0
 friend_of_mine_count=0
 
@@ -41,13 +41,13 @@ do
 	echo "READING 'ipfstryme' message from $liking_me"
 	for peerline in $(~/.zen/astrXbian/zen/jaklis/jaklis.py read -n50 -j | jq -r --arg friendKEY "$liking_me" '.[] | select(.pubkey == $friendKEY)' | jq 'select(.title == "ipfstryme")' | jq -r '.content');
         do
-			echo "$peerline"
+			echo "PEERLINE: $peerline"
 			# KEEP A_swarm_map.txt uniq "$peerline" line
-            cat ~/.zen/A_swarm_map.txt | grep -v -E "$peerline" > ~/.zen/A_swarm_map.txt
-            # Fill a file with friend of mine ip 
 			echo $peerline >> ~/.zen/A_swarm_map.txt
-
-			# Get its ipfsnodeid			
+            cat ~/.zen/A_swarm_map.txt | uniq > /tmp/A_swarm_map.txt
+			cp -f /tmp/A_swarm_map.txt ~/.zen/A_swarm_map.txt
+			
+			# Get ipfsnodeid			
             ipfsnodeid=$(echo "$peerline" | awk -F '/' '{print $8}')
             [[ "$ipfsnodeid" == "" ]] && continue
             whoisg1=$(~/.zen/astrXbian/zen/tools/ipfs_to_g1.py $ipfsnodeid)
diff --git a/zen/ipfs_SWARM_refresh.sh b/zen/ipfs_SWARM_refresh.sh
index ab5b481..381705d 100755
--- a/zen/ipfs_SWARM_refresh.sh
+++ b/zen/ipfs_SWARM_refresh.sh
@@ -52,18 +52,19 @@ do
     echo "${peerline}"
 	myfriendpeer=$(cat ~/.zen/A_my_swarm.txt | grep $ipfsnodeid )
 	if [[ "$myfriendpeer" != "" ]]; then
-		echo "REFRESH /ipns/$ipfsnodeid INTO ~/.zen/ipfs_swarm/"
-		$MY_PATH/tools/timeout.sh -t 30 ipfs get --output=/home/$YOU/.zen/ipfs_swarm/ /ipns/$ipfsnodeid
+		echo "OK REFRESH /ipns/$ipfsnodeid INTO ~/.zen/ipfs_swarm/"
+		$MY_PATH/tools/timeout.sh -t 20 ipfs get --output=/home/$YOU/.zen/ipfs_swarm/ /ipns/$ipfsnodeid
         ipfs swarm connect $peerline
         ipfs bootstrap add $peerline
 	else
-		echo "#YOU CAN ACTIVATE FAIL2BAN # ADD $USER NOPASSWD:ALL in /etc/sudoers"
+		echo "KO ___________________ # YOU CAN ACTIVATE FAIL2BAN"
+		# PLEASE ADD $USER NOPASSWD:ALL for fail2ban-client in /etc/sudoers
 		# sudo fail2ban-client add recidive 2>/dev/null 1>&2
 		# sudo fail2ban-client start recidive
 		# sudo fail2ban-client set recidive banip $ip
 		# Show banned IP 
 		# sudo fail2ban-client status recidive
-		echo "FALSE BAN $ip ($ipfsnodeid)"
+		echo "?? BAN $ip ($ipfsnodeid)"
 	fi
 done