|  | @@ -28,12 +28,10 @@
 | 
	
		
			
			| 28 | 28 |  # You should have received a copy of the GNU General Public License
 | 
	
		
			
			| 29 | 29 |  # along with this program. If not, see <http://www.gnu.org/licenses/>.
 | 
	
		
			
			| 30 | 30 |  
 | 
	
		
			
			| 31 |  | -IRSSI_PATH=/usr/bin/irssi
 | 
	
		
			
			| 32 | 31 |  MUMBLE_PATH=/usr/bin/mumble
 | 
	
		
			
			| 33 | 32 |  TOXIC_PATH=/usr/bin/toxic
 | 
	
		
			
			| 34 | 33 |  DHTNODES=/usr/share/toxic/DHTnodes
 | 
	
		
			
			| 35 | 34 |  
 | 
	
		
			
			| 36 |  | -IRC_PORT=6697
 | 
	
		
			
			| 37 | 35 |  PEERS_FILE=/tmp/meshpeers.txt
 | 
	
		
			
			| 38 | 36 |  
 | 
	
		
			
			| 39 | 37 |  TOX_PORT=33445
 | 
	
	
		
			
			|  | @@ -245,7 +243,6 @@ if [[ $SERVER_INSTALLATION == "no" ]]; then
 | 
	
		
			
			| 245 | 243 |      if [ ! -f /tmp/meshtype ]; then
 | 
	
		
			
			| 246 | 244 |          install_toxcore
 | 
	
		
			
			| 247 | 245 |          install_toxid
 | 
	
		
			
			| 248 |  | -        install_zeronet
 | 
	
		
			
			| 249 | 246 |          sudo batman start
 | 
	
		
			
			| 250 | 247 |          if [ ! "$?" = "0" ]; then
 | 
	
		
			
			| 251 | 248 |              exit 2
 | 
	
	
		
			
			|  | @@ -312,47 +309,27 @@ if [ ! $AVAHI_DOMAIN ]; then
 | 
	
		
			
			| 312 | 309 |  fi
 | 
	
		
			
			| 313 | 310 |  
 | 
	
		
			
			| 314 | 311 |  # if only mumble is installed
 | 
	
		
			
			| 315 |  | -if [ ! -f $IRSSI_PATH ]; then
 | 
	
		
			
			| 316 |  | -    if [ ! -f $TOXIC_PATH ]; then
 | 
	
		
			
			| 317 |  | -        if [ -f $MUMBLE_PATH ]; then
 | 
	
		
			
			| 318 |  | -            $MUMBLE_PATH &
 | 
	
		
			
			| 319 |  | -            exit 0
 | 
	
		
			
			| 320 |  | -        fi
 | 
	
		
			
			| 321 |  | -        echo 'You need irssi/mumble/toxic installed on your system'
 | 
	
		
			
			| 322 |  | -        if [[ $SERVER_INSTALLATION == "no" ]]; then
 | 
	
		
			
			| 323 |  | -            sudo batman stop
 | 
	
		
			
			| 324 |  | -        fi
 | 
	
		
			
			| 325 |  | -        exit 4
 | 
	
		
			
			|  | 312 | +if [ ! -f $TOXIC_PATH ]; then
 | 
	
		
			
			|  | 313 | +    if [ -f $MUMBLE_PATH ]; then
 | 
	
		
			
			|  | 314 | +        $MUMBLE_PATH &
 | 
	
		
			
			|  | 315 | +        exit 0
 | 
	
		
			
			| 326 | 316 |      fi
 | 
	
		
			
			| 327 |  | -fi
 | 
	
		
			
			| 328 |  | -
 | 
	
		
			
			| 329 |  | -# if only irssi is installed
 | 
	
		
			
			| 330 |  | -if [ ! -f $MUMBLE_PATH ]; then
 | 
	
		
			
			| 331 |  | -    if [ ! -f $TOXIC_PATH ]; then
 | 
	
		
			
			| 332 |  | -        if [ -f $IRSSI_PATH ]; then
 | 
	
		
			
			| 333 |  | -            $IRSSI_PATH -c $AVAHI_DOMAIN -p $IRC_PORT -n $USER
 | 
	
		
			
			| 334 |  | -            exit 0
 | 
	
		
			
			| 335 |  | -        fi
 | 
	
		
			
			| 336 |  | -        echo 'You need irssi/mumble/toxic installed on your system'
 | 
	
		
			
			| 337 |  | -        if [[ $SERVER_INSTALLATION == "no" ]]; then
 | 
	
		
			
			| 338 |  | -            sudo batman stop
 | 
	
		
			
			| 339 |  | -        fi
 | 
	
		
			
			| 340 |  | -        exit 4
 | 
	
		
			
			|  | 317 | +    echo 'You need mumble/toxic/qTox installed on your system'
 | 
	
		
			
			|  | 318 | +    if [[ $SERVER_INSTALLATION == "no" ]]; then
 | 
	
		
			
			|  | 319 | +        sudo batman stop
 | 
	
		
			
			| 341 | 320 |      fi
 | 
	
		
			
			|  | 321 | +    exit 4
 | 
	
		
			
			| 342 | 322 |  fi
 | 
	
		
			
			| 343 | 323 |  
 | 
	
		
			
			| 344 | 324 |  # if only tox is installed
 | 
	
		
			
			| 345 | 325 |  if [ ! -f $MUMBLE_PATH ]; then
 | 
	
		
			
			| 346 |  | -    if [ ! -f $IRSSI_PATH ]; then
 | 
	
		
			
			| 347 |  | -        run_tox
 | 
	
		
			
			| 348 |  | -    fi
 | 
	
		
			
			|  | 326 | +    run_tox
 | 
	
		
			
			| 349 | 327 |  fi
 | 
	
		
			
			| 350 | 328 |  
 | 
	
		
			
			| 351 | 329 |  echo ''
 | 
	
		
			
			| 352 | 330 |  echo 'Choose communication service:'
 | 
	
		
			
			| 353 | 331 |  echo '    1. VoIP'
 | 
	
		
			
			| 354 | 332 |  echo '    2. Tox Chat'
 | 
	
		
			
			| 355 |  | -echo '    3. IRC (WARNING: not secure)'
 | 
	
		
			
			| 356 | 333 |  echo ''
 | 
	
		
			
			| 357 | 334 |  
 | 
	
		
			
			| 358 | 335 |  read peer_index
 | 
	
	
		
			
			|  | @@ -387,10 +364,4 @@ if [[ $peer_index == 2 ]]; then
 | 
	
		
			
			| 387 | 364 |      run_tox
 | 
	
		
			
			| 388 | 365 |  fi
 | 
	
		
			
			| 389 | 366 |  
 | 
	
		
			
			| 390 |  | -if [[ $peer_index == 3 ]]; then
 | 
	
		
			
			| 391 |  | -    if [ -f $IRSSI_PATH ]; then
 | 
	
		
			
			| 392 |  | -        $IRSSI_PATH -c $AVAHI_DOMAIN -p $IRC_PORT -n $USER
 | 
	
		
			
			| 393 |  | -    fi
 | 
	
		
			
			| 394 |  | -fi
 | 
	
		
			
			| 395 |  | -
 | 
	
		
			
			| 396 | 367 |  exit 0
 |