diff --git a/zen/ipfs_SWARM_refresh.sh b/zen/ipfs_SWARM_refresh.sh index b968e6c..a6fbc5d 100755 --- a/zen/ipfs_SWARM_refresh.sh +++ b/zen/ipfs_SWARM_refresh.sh @@ -45,7 +45,8 @@ echo "RETRIEVING MY OWN DATA FROM IPNS TO ~/.zen/ipfs_swarm" ipfs get --output=/home/$YOU/.zen/ipfs_swarm/ /ipns/$IPFSNODEID ######################################################################## count=1 -for ipfsnodeid in $( (ipfs swarm peers | grep -o '[^/]*$' && cat /tmp/A_swarm | grep -o '[^/]*$' ) | sort | uniq); +ipfs swarm peers > /tmp/ipfs_swarm_peers +for ipfsnodeid in $( (cat /tmp/ipfs_swarm_peers | grep -o '[^/]*$' && cat /tmp/A_swarm | grep -o '[^/]*$' ) | sort | uniq); do ## $ipfsnodeid already Treated ? [[ -f ~/.zen/ipfs_swarm/.$ipfsnodeid/_xbian.zuid ]] && XID=$(cat ~/.zen/ipfs_swarm/.$ipfsnodeid/_xbian.zuid) @@ -59,7 +60,7 @@ do # control ip isLAN? peerline=$(cat ~/.zen/A_swarm_map.txt | grep "$ipfsnodeid" | head -n 1) - [[ ! $peerline ]] && peerline=$(ipfs swarm peers | grep "$ipfsnodeid" | head -n 1) + [[ ! $peerline ]] && peerline=$(cat /tmp/ipfs_swarm_peers | grep "$ipfsnodeid" | head -n 1) ip=$(cat ~/.zen/A_swarm_map.txt | grep "$ipfsnodeid" | awk -F '/' '{print $3}' | head -n 1) isLAN=$(echo $ip | cut -f3 -d '/' | grep -E "(^127\.)|(^192\.168\.)|(^fd42\:)|(^10\.)|(^172\.1[6-9]\.)|(^172\.2[0-9]\.)|(^172\.3[0-1]\.)|(^::1$)|(^[fF][cCdD])/") @@ -70,7 +71,7 @@ do echo "$peerline" myfriendpeer=$(cat ~/.zen/A_my_swarm.txt | grep $ipfsnodeid ) if [[ "$myfriendpeer" != "" ]]; then - if [[ ! $(ipfs swarm peers | grep $ipfsnodeid) ]]; then + if [[ ! $(cat /tmp/ipfs_swarm_peers | grep $ipfsnodeid) ]]; then ipfs swarm connect "$peerline" if [ $? != 0 ]; then grep -vEi $ip ~/.zen/A_my_swarm.txt @@ -109,7 +110,8 @@ do [[ -f ~/.zen/DEFCON ]] && export DEFCON=$(cat ~/.zen/DEFCON) || export DEFCON=$(cat ~/.zen/astrXbian/DEFCON) # like in crom_MINUTE.sh echo "!!! UNKNOWN FRIEND !!! $ip ___ $ipfsnodeid ________ # DEFCON : $DEFCON " rm -Rf ~/.zen/ipfs_swarm/.$ipfsnodeid - if [[ ( $DEFCON < 5 ) && ! $isLAN ]] + ip=$(cat /tmp/ipfs_swarm_peers | grep "$ipfsnodeid" | awk -F '/' '{print $3}' | head -n 1) + if [[ $ip && ( $DEFCON < 5 ) && ! $isLAN ]] then ## DEFCON 4 ### SECURITY CHOICE TO MAKE IN /etc/sudoers ###