| 
				
			 | 
			
			
				@@ -162,25 +162,34 @@ function configure_ssh_client { 
			 | 
		
	
		
			
			| 
				162
			 | 
			
				162
			 | 
			
			
				     if [ ! -d ~/.ssh ]; then 
			 | 
		
	
		
			
			| 
				163
			 | 
			
				163
			 | 
			
			
				         mkdir ~/.ssh 
			 | 
		
	
		
			
			| 
				164
			 | 
			
				164
			 | 
			
			
				     fi 
			 | 
		
	
		
			
			| 
				165
			 | 
			
				
			 | 
			
			
				-    echo 'Host *.onion' > ~/.ssh/config 
			 | 
		
	
		
			
			| 
				166
			 | 
			
				
			 | 
			
			
				-    echo '  ServerAliveInterval 60' >> ~/.ssh/config 
			 | 
		
	
		
			
			| 
				167
			 | 
			
				
			 | 
			
			
				-    echo '  ServerAliveCountMax 3' >> ~/.ssh/config 
			 | 
		
	
		
			
			| 
				168
			 | 
			
				
			 | 
			
			
				- 
			 | 
		
	
		
			
			| 
				
			 | 
			
				165
			 | 
			
			
				+    if [ ! -f ~/.ssh/config ]; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				166
			 | 
			
			
				+        touch ~/.ssh/config 
			 | 
		
	
		
			
			| 
				
			 | 
			
				167
			 | 
			
			
				+    fi 
			 | 
		
	
		
			
			| 
				169
			 | 
			
				168
			 | 
			
			
				     proxycmd="connect -R remote -5 -S 127.0.0.1:9050 %h %p" 
			 | 
		
	
		
			
			| 
				170
			 | 
			
				169
			 | 
			
			
				     if [ -f /usr/bin/pacman ]; then 
			 | 
		
	
		
			
			| 
				171
			 | 
			
				170
			 | 
			
			
				         proxycmd="/usr/bin/nc -X 5 -x 127.0.0.1:9050 %h %p" 
			 | 
		
	
		
			
			| 
				172
			 | 
			
				171
			 | 
			
			
				     fi 
			 | 
		
	
		
			
			| 
				173
			 | 
			
				
			 | 
			
			
				- 
			 | 
		
	
		
			
			| 
				174
			 | 
			
				
			 | 
			
			
				-    if [[ $ENABLE_MONKEYSPHERE == $'yes' || $ENABLE_MONKEYSPHERE == $'y' ]]; then 
			 | 
		
	
		
			
			| 
				175
			 | 
			
				
			 | 
			
			
				-        echo "  ProxyCommand sh -c 'monkeysphere ssh-proxycommand --no-connect %h %p ; $proxycmd'" >> ~/.ssh/config 
			 | 
		
	
		
			
			| 
				176
			 | 
			
				
			 | 
			
			
				-    else 
			 | 
		
	
		
			
			| 
				177
			 | 
			
				
			 | 
			
			
				-        echo "  ProxyCommand $proxycmd" >> ~/.ssh/config 
			 | 
		
	
		
			
			| 
				178
			 | 
			
				
			 | 
			
			
				-    fi 
			 | 
		
	
		
			
			| 
				179
			 | 
			
				
			 | 
			
			
				-    echo 'Host *' >> ~/.ssh/config 
			 | 
		
	
		
			
			| 
				180
			 | 
			
				
			 | 
			
			
				-    echo '  ServerAliveInterval 60' >> ~/.ssh/config 
			 | 
		
	
		
			
			| 
				181
			 | 
			
				
			 | 
			
			
				-    echo '  ServerAliveCountMax 3' >> ~/.ssh/config 
			 | 
		
	
		
			
			| 
				182
			 | 
			
				
			 | 
			
			
				-    if [[ $ENABLE_MONKEYSPHERE == $'yes' || $ENABLE_MONKEYSPHERE == $'y' ]]; then 
			 | 
		
	
		
			
			| 
				183
			 | 
			
				
			 | 
			
			
				-        echo '  ProxyCommand monkeysphere ssh-proxycommand %h %p' >> ~/.ssh/config 
			 | 
		
	
		
			
			| 
				
			 | 
			
				172
			 | 
			
			
				+    if ! grep -q "# ${PROJECT_NAME} settings" ~/.ssh/config; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				173
			 | 
			
			
				+        if ! grep -q "Host *.onion" ~/.ssh/config; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				174
			 | 
			
			
				+            echo "# ${PROJECT_NAME} settings start" >> ~/.ssh/config 
			 | 
		
	
		
			
			| 
				
			 | 
			
				175
			 | 
			
			
				+            echo 'Host *.onion' >> ~/.ssh/config 
			 | 
		
	
		
			
			| 
				
			 | 
			
				176
			 | 
			
			
				+            echo '  ServerAliveInterval 60' >> ~/.ssh/config 
			 | 
		
	
		
			
			| 
				
			 | 
			
				177
			 | 
			
			
				+            echo '  ServerAliveCountMax 3' >> ~/.ssh/config 
			 | 
		
	
		
			
			| 
				
			 | 
			
				178
			 | 
			
			
				+ 
			 | 
		
	
		
			
			| 
				
			 | 
			
				179
			 | 
			
			
				+ 
			 | 
		
	
		
			
			| 
				
			 | 
			
				180
			 | 
			
			
				+            if [[ $ENABLE_MONKEYSPHERE == $'yes' || $ENABLE_MONKEYSPHERE == $'y' ]]; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				181
			 | 
			
			
				+                echo "  ProxyCommand sh -c 'monkeysphere ssh-proxycommand --no-connect %h %p ; $proxycmd'" >> ~/.ssh/config 
			 | 
		
	
		
			
			| 
				
			 | 
			
				182
			 | 
			
			
				+            else 
			 | 
		
	
		
			
			| 
				
			 | 
			
				183
			 | 
			
			
				+                echo "  ProxyCommand $proxycmd" >> ~/.ssh/config 
			 | 
		
	
		
			
			| 
				
			 | 
			
				184
			 | 
			
			
				+            fi 
			 | 
		
	
		
			
			| 
				
			 | 
			
				185
			 | 
			
			
				+            echo 'Host *' >> ~/.ssh/config 
			 | 
		
	
		
			
			| 
				
			 | 
			
				186
			 | 
			
			
				+            echo '  ServerAliveInterval 60' >> ~/.ssh/config 
			 | 
		
	
		
			
			| 
				
			 | 
			
				187
			 | 
			
			
				+            echo '  ServerAliveCountMax 3' >> ~/.ssh/config 
			 | 
		
	
		
			
			| 
				
			 | 
			
				188
			 | 
			
			
				+            if [[ $ENABLE_MONKEYSPHERE == $'yes' || $ENABLE_MONKEYSPHERE == $'y' ]]; then 
			 | 
		
	
		
			
			| 
				
			 | 
			
				189
			 | 
			
			
				+                echo '  ProxyCommand monkeysphere ssh-proxycommand %h %p' >> ~/.ssh/config 
			 | 
		
	
		
			
			| 
				
			 | 
			
				190
			 | 
			
			
				+            fi 
			 | 
		
	
		
			
			| 
				
			 | 
			
				191
			 | 
			
			
				+            echo "# ${PROJECT_NAME} settings end" >> ~/.ssh/config 
			 | 
		
	
		
			
			| 
				
			 | 
			
				192
			 | 
			
			
				+        fi 
			 | 
		
	
		
			
			| 
				184
			 | 
			
				193
			 | 
			
			
				     fi 
			 | 
		
	
		
			
			| 
				185
			 | 
			
				194
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				186
			 | 
			
				195
			 | 
			
			
				     echo '' 
			 |