Unnecessary coments removed / v.0.5.3 --> v.0.5.4

Author: radio24

CONTRIBUTING.md

@@ -42,7 +42,7 @@ Please bear the following coding guidelines in mind:
   **Example for a short menu**
   ```shell
   clear
-  CHOICE=$(whiptail --cancel-button "Back" --title "TorBox v.0.5.3 - ADD BRIDGES MENU" --menu "Choose an option (ESC -> back to the main menu)" $MENU_HEIGHT $MENU_WIDTH $MENU_LIST_HEIGHT \
+  CHOICE=$(whiptail --cancel-button "Back" --title "TorBox v.0.5.4 - ADD BRIDGES MENU" --menu "Choose an option (ESC -> back to the main menu)" $MENU_HEIGHT $MENU_WIDTH $MENU_LIST_HEIGHT \
   "==" "===============================================================" \
   " 1" "Add one OBFS4 bridge automatically (one bridge every 24 hours)"  \
   " 2" "Add OBFS4 bridges manually"  \

bin/backup

@@ -88,7 +88,7 @@ if (whiptail --title "TorBox - INFO (scroll down!)" --scrolltext --yesno "$INPUT
 
 		# Please, choose with SPACE which data you want to includ
 		if [ "$OBFS4RELAY" == "1" ] || [ "$ONIONSERVICES" == "1" ] || [ "$ONIONAUTH" == "1" ] ; then
-			WHIPTAIL_LINE="whiptail --nocancel --title \"TorBox v.0.5.3 - BACKUP SELECTION\" --checklist --separate-output \"\nAdditionally to the TorBox configuration, we have found OBFS4 Bridge Relay and/or Onion Services data, which can be included in the backup. \n\nPlease, choose with SPACE which data you want to includ and press ENTER \n(ESC -> go back)\n\" $MENU_HEIGHT_20 $MENU_WIDTH 3"
+			WHIPTAIL_LINE="whiptail --nocancel --title \"TorBox v.0.5.4 - BACKUP SELECTION\" --checklist --separate-output \"\nAdditionally to the TorBox configuration, we have found OBFS4 Bridge Relay and/or Onion Services data, which can be included in the backup. \n\nPlease, choose with SPACE which data you want to includ and press ENTER \n(ESC -> go back)\n\" $MENU_HEIGHT_20 $MENU_WIDTH 3"
 			i=0
 			n=0
 			if [ "$OBFS4RELAY" == "1" ]; then

bin/bridges_activate_obfs4

@@ -94,7 +94,7 @@ if [ $number_configured_bridges_deactivated = 0 ]; then
 fi
 
 clear
-CHOICE=$(whiptail --cancel-button "Back" --title "TorBox v.0.5.3 - BRIDGE ACTIVATION MENU" --menu "Choose an option (ESC -> go back)" $MENU_HEIGHT $MENU_WIDTH $MENU_LIST_HEIGHT \
+CHOICE=$(whiptail --cancel-button "Back" --title "TorBox v.0.5.4 - BRIDGE ACTIVATION MENU" --menu "Choose an option (ESC -> go back)" $MENU_HEIGHT $MENU_WIDTH $MENU_LIST_HEIGHT \
 "==" "===============================================================" \
 " 1" "Activate ALL configured OBFS4 bridges"  \
 " 2" "Activate only OBFS4 bridges, which are ONLINE"  \

bin/bridges_add_obfs4

@@ -72,7 +72,7 @@ i=0
 ###########################
 
 clear
-CHOICE=$(whiptail --cancel-button "Back" --title "TorBox v.0.5.3 - ADD BRIDGES MENU" --menu "Choose an option (ESC -> go back)" $MENU_HEIGHT $MENU_WIDTH $MENU_LIST_HEIGHT \
+CHOICE=$(whiptail --cancel-button "Back" --title "TorBox v.0.5.4 - ADD BRIDGES MENU" --menu "Choose an option (ESC -> go back)" $MENU_HEIGHT $MENU_WIDTH $MENU_LIST_HEIGHT \
 "==" "===============================================================" \
 " 1" "Add OBFS4 bridges automatically"  \
 " 2" "Add OBFS4 bridges manually"  \

bin/bridges_add_snowflake

@@ -73,7 +73,7 @@ i=0
 ###########################
 
 clear
-CHOICE=$(whiptail --cancel-button "Back" --title "TorBox v.0.5.3 - ADD BRIDGES MENU" --menu "Choose an option (ESC -> go back)" $MENU_HEIGHT $MENU_WIDTH $MENU_LIST_HEIGHT \
+CHOICE=$(whiptail --cancel-button "Back" --title "TorBox v.0.5.4 - ADD BRIDGES MENU" --menu "Choose an option (ESC -> go back)" $MENU_HEIGHT $MENU_WIDTH $MENU_LIST_HEIGHT \
 "==" "===============================================================" \
 " 1" "Add Snowflake bridges automatically"  \
 " 2" "Add Snowflake bridges manually"  \

bin/bridges_deactivate_obfs4

@@ -94,7 +94,7 @@ if [ $number_configured_bridges_activated = 0 ]; then
 fi
 
 clear
-CHOICE=$(whiptail --cancel-button "Back" --title "TorBox v.0.5.3 - BRIDGE DEACTIVATION MENU" --menu "Choose an option (ESC -> go back)" $MENU_HEIGHT $MENU_WIDTH $MENU_LIST_HEIGHT \
+CHOICE=$(whiptail --cancel-button "Back" --title "TorBox v.0.5.4 - BRIDGE DEACTIVATION MENU" --menu "Choose an option (ESC -> go back)" $MENU_HEIGHT $MENU_WIDTH $MENU_LIST_HEIGHT \
 "==" "===============================================================" \
 " 1" "Deactivate ALL configured OBFS4 bridges and directly connect tor"  \
 " 2" "Deactivate only OBFS4 bridges, which are not longer ONLINE"  \

bin/bridges_remove_obfs4

@@ -90,7 +90,7 @@ if [ $EXITID = "EXITID=1" ]; then
 fi
 
 clear
-CHOICE=$(whiptail --cancel-button "Back" --title "TorBox v.0.5.3 - BRIDGE REMOVAL MENU" --menu "Choose an option (ESC -> go back)" $MENU_HEIGHT $MENU_WIDTH $MENU_LIST_HEIGHT \
+CHOICE=$(whiptail --cancel-button "Back" --title "TorBox v.0.5.4 - BRIDGE REMOVAL MENU" --menu "Choose an option (ESC -> go back)" $MENU_HEIGHT $MENU_WIDTH $MENU_LIST_HEIGHT \
 "==" "===============================================================" \
 " 1" "Delete ALL configured OBFS4 bridges and directly connect tor"  \
 " 2" "Delete only OBFS4 bridges, which do not exist anymore"  \

bin/bridges_remove_snowflake

@@ -90,7 +90,7 @@ if [ $EXITID = "EXITID=1" ]; then
 fi
 
 clear
-CHOICE=$(whiptail --cancel-button "Back" --title "TorBox v.0.5.3 - BRIDGE REMOVAL MENU" --menu "Choose an option (ESC -> go back)" $MENU_HEIGHT $MENU_WIDTH $MENU_LIST_HEIGHT \
+CHOICE=$(whiptail --cancel-button "Back" --title "TorBox v.0.5.4 - BRIDGE REMOVAL MENU" --menu "Choose an option (ESC -> go back)" $MENU_HEIGHT $MENU_WIDTH $MENU_LIST_HEIGHT \
 "==" "===============================================================" \
 " 1" "Delete ALL configured Snowflake bridges and directly connect tor"  \
 " 2" "Delete only Snowflake bridges, which do not exist anymore"  \

bin/change_MAC

@@ -96,7 +96,7 @@ change_mac_address()
 	O_DEVICE=$1
 	exitstatus=0
 	if [ -z "$CHOICE2" ]; then
-		INPUT="TorBox v.0.5.3 - Change the MAC address for $O_DEVICE"
+		INPUT="TorBox v.0.5.4 - Change the MAC address for $O_DEVICE"
 		CHOICE2=$(whiptail --nocancel --title "$INPUT" --radiolist "Choose with SPACE and then press ENTER (ESC -> go back)" 9 $MENU_WIDTH 3 \
 		"1" "Randomize the MAC addresse(s)" ON \
 		"2" "Use the permanent, unique MAC address of the interface(s)" OFF \
@@ -112,7 +112,7 @@ change_mac_address()
 				MAC_ADDRESS="random"
 				sudo sed -i "s/^MAC_$O_DEVICE=.*/MAC_$O_DEVICE=$MAC_ADDRESS/" ${RUNFILE}
 				clear
-				# NEW v.0.5.3: We have only to put an interface down, if it is not already down
+				# We have only to put an interface down, if it is not already down
 				# ATTENTION not connected interfaces have to put down, even the state is already down --> NO-CARRIER
 				if ip link | grep "$O_DEVICE" | grep -e "state UP" -e "NO-CARRIER" ; then
 					echo -e "${RED}[+] Shutting interface $O_DEVICE down!${NOCOLOR}"
@@ -125,7 +125,7 @@ change_mac_address()
 				echo
 				sudo macchanger -r $O_DEVICE
 				echo
-				# NEW v.0.5.3: We have only to put an interface up, if it was up before
+				# We have only to put an interface up, if it was up before
 				if [ "$INTERFACE1_DOWN" == "1" ]; then
 					echo -e "${RED}[+] Starting up interface $O_DEVICE!${NOCOLOR}"
 					sudo ip link set dev $O_DEVICE up
@@ -139,7 +139,7 @@ change_mac_address()
 				MAC_ADDRESS="permanent"
 				sudo sed -i "s/^MAC_$O_DEVICE=.*/MAC_$O_DEVICE=$MAC_ADDRESS/" ${RUNFILE}
 				clear
-				# NEW v.0.5.3: We have only to put an interface down, if it is not already down
+				# We have only to put an interface down, if it is not already down
 				# ATTENTION not connected interfaces have to put down, even the state is already down --> NO-CARRIER
 				if ip link | grep "$O_DEVICE" | grep -e "state UP" -e "NO-CARRIER" ; then
 					echo -e "${RED}[+] Shutting interface $O_DEVICE down!${NOCOLOR}"
@@ -152,7 +152,7 @@ change_mac_address()
 				echo
 				sudo macchanger -p $O_DEVICE
 				echo
-				# NEW v.0.5.3: We have only to put an interface up, if it was up before
+				# We have only to put an interface up, if it was up before
 				if [ "$INTERFACE1_DOWN" == "1" ]; then
 					echo -e "${RED}[+] Starting up interface $O_DEVICE!${NOCOLOR}"
 					sudo ip link set dev $O_DEVICE up
@@ -178,7 +178,7 @@ change_mac_address()
 				 	fi
 				 	sudo sed -i "s/^MAC_$O_DEVICE=.*/MAC_$O_DEVICE=$MAC_ADDRESS/" ${RUNFILE}
 					clear
-					# NEW v.0.5.3: We have only to put an interface down, if it is not already down
+					# We have only to put an interface down, if it is not already down
 					# ATTENTION not connected interfaces have to put down, even the state is already down --> NO-CARRIER
 					if ip link | grep "$O_DEVICE" | grep -e "state UP" -e "NO-CARRIER" ; then
 						echo -e "${RED}[+] Shutting interface $O_DEVICE down!${NOCOLOR}"
@@ -189,7 +189,7 @@ change_mac_address()
 					#
 					echo -e "${RED}[+] Setting MAC address to $MAC_ADDRESS ${NOCOLOR}"
 			 		sudo ip link set dev $O_DEVICE address $MAC_ADDRESS
-					# NEW v.0.5.3: We have only to put an interface up, if it was up before
+					# We have only to put an interface up, if it was up before
 					if [ "$INTERFACE1_DOWN" == "1" ]; then
 						echo -e "${RED}[+] Starting up interface $O_DEVICE!${NOCOLOR}"
 			 			sudo ip link set dev $O_DEVICE up
@@ -239,7 +239,7 @@ change_mac_address_finish()
 read_config
 
 if [ -z "$CHOICE2" ]; then
-	CHOICE3=$(whiptail --cancel-button "Back" --title "TorBox v.0.5.3 - MAC ADRESSES OF TORBOX'S INTERFACES" --menu "Choose an option (ESC -> go back)" $MENU_HEIGHT $MENU_WIDTH $MENU_LIST_HEIGHT \
+	CHOICE3=$(whiptail --cancel-button "Back" --title "TorBox v.0.5.4 - MAC ADRESSES OF TORBOX'S INTERFACES" --menu "Choose an option (ESC -> go back)" $MENU_HEIGHT $MENU_WIDTH $MENU_LIST_HEIGHT \
 	"==" "===============================================================" \
 	" 1" "Change/randomize the MAC adresses of TorBox's interfaces"  \
 	" 2" "List the MAC adresses of TorBox's interfaces"  \
@@ -256,7 +256,7 @@ case "$CHOICE3" in
 		if [ -z "$CHOICE2" ]; then
 			if grep -q "usb0" <<< "$AVAILABLE_INTERFACES"; then
 				###### DISPLAY THE AVAILABLE INTERFACES inluding usb0 ######
-				CHOICE=$(whiptail --nocancel --title "TorBox v.0.5.3 - CHANGE MAC ADRESSES" --checklist --separate-output "Choose with SPACE and then press ENTER (ESC -> go back)" 11 $MENU_WIDTH 5 \
+				CHOICE=$(whiptail --nocancel --title "TorBox v.0.5.4 - CHANGE MAC ADRESSES" --checklist --separate-output "Choose with SPACE and then press ENTER (ESC -> go back)" 11 $MENU_WIDTH 5 \
 				"1" "Change the wireless interface 0 (onboard chip; wlan0)" OFF \
 				"2" "Change the wireless interface 1 (USB adapter; wlan1)" OFF \
 				"3" "Change the ethernet interface 0 (onboard ethernet connector; eth0)" OFF \
@@ -265,7 +265,7 @@ case "$CHOICE3" in
 				3>&1 1>&2 2>&3)
 			else
 				###### DISPLAY THE AVAILABLE INTERFACES without usb0 ######
-				CHOICE=$(whiptail --nocancel --title "TorBox v.0.5.3 - CHANGE MAC ADRESSES" --checklist --separate-output "Choose with SPACE and then press ENTER (ESC -> go back)" 10 $MENU_WIDTH 4 \
+				CHOICE=$(whiptail --nocancel --title "TorBox v.0.5.4 - CHANGE MAC ADRESSES" --checklist --separate-output "Choose with SPACE and then press ENTER (ESC -> go back)" 10 $MENU_WIDTH 4 \
 				"1" "Change the wireless interface 0 (onboard chip; wlan0)" OFF \
 				"2" "Change the wireless interface 1 (USB adapter; wlan1)" OFF \
 				"3" "Change the ethernet interface 0 (onboard ethernet connector; eth0)" OFF \
@@ -305,36 +305,26 @@ case "$CHOICE3" in
 		echo ""
 		O_DEVICE="wlan0"
 		if grep -q "$O_DEVICE" <<< "$AVAILABLE_INTERFACES"; then
-			# NEW v.0.5.3 Use ip instead of ifconfig
-			#MAC_ADDRESS_NUMBER=$(ifconfig $O_DEVICE | grep -o -E '([[:xdigit:]]{1,2}:){5}[[:xdigit:]]{1,2}')
 			MAC_ADDRESS_NUMBER=$(ip -o link show $O_DEVICE | cut -d ' ' -f 2,20 | grep -o -E '([[:xdigit:]]{1,2}:){5}[[:xdigit:]]{1,2}')
  			echo -e "Interface: ${RED}$O_DEVICE${NOCOLOR} - status: ${RED}$MAC_wlan0${NOCOLOR} - current MAC: ${RED}$MAC_ADDRESS_NUMBER${NOCOLOR}"
 		fi
 		O_DEVICE="wlan1"
 		if grep -q "$O_DEVICE" <<< "$AVAILABLE_INTERFACES"; then
-			# NEW v.0.5.3 Use ip instead of ifconfig
-			#MAC_ADDRESS_NUMBER=$(ifconfig $O_DEVICE | grep -o -E '([[:xdigit:]]{1,2}:){5}[[:xdigit:]]{1,2}')
 			MAC_ADDRESS_NUMBER=$(ip -o link show $O_DEVICE | cut -d ' ' -f 2,20 | grep -o -E '([[:xdigit:]]{1,2}:){5}[[:xdigit:]]{1,2}')
 			echo -e "Interface: ${RED}$O_DEVICE${NOCOLOR} - status: ${RED}$MAC_wlan1${NOCOLOR} - current MAC: ${RED}$MAC_ADDRESS_NUMBER${NOCOLOR}"
 		fi
 		O_DEVICE="eth0"
 		if grep -q "$O_DEVICE" <<< "$AVAILABLE_INTERFACES"; then
-			# NEW v.0.5.3 Use ip instead of ifconfig
-			#MAC_ADDRESS_NUMBER=$(ifconfig $O_DEVICE | grep -o -E '([[:xdigit:]]{1,2}:){5}[[:xdigit:]]{1,2}')
 			MAC_ADDRESS_NUMBER=$(ip -o link show $O_DEVICE | cut -d ' ' -f 2,20 | grep -o -E '([[:xdigit:]]{1,2}:){5}[[:xdigit:]]{1,2}')
 			echo -e "Interface: ${RED}$O_DEVICE${NOCOLOR} - status: ${RED}$MAC_eth0${NOCOLOR} - current MAC: ${RED}$MAC_ADDRESS_NUMBER${NOCOLOR}"
 		fi
 		O_DEVICE="eth1"
 		if grep -q "$O_DEVICE" <<< "$AVAILABLE_INTERFACES"; then
-			# NEW v.0.5.3 Use ip instead of ifconfig
-			#MAC_ADDRESS_NUMBER=$(ifconfig $O_DEVICE | grep -o -E '([[:xdigit:]]{1,2}:){5}[[:xdigit:]]{1,2}')
 			MAC_ADDRESS_NUMBER=$(ip -o link show $O_DEVICE | cut -d ' ' -f 2,20 | grep -o -E '([[:xdigit:]]{1,2}:){5}[[:xdigit:]]{1,2}')
  			echo -e "Interface: ${RED}$O_DEVICE${NOCOLOR} - status: ${RED}$MAC_eth1${NOCOLOR} - current MAC: ${RED}$MAC_ADDRESS_NUMBER${NOCOLOR}"
 		fi
 		O_DEVICE="usb0"
 		if grep -q "$O_DEVICE" <<< "$AVAILABLE_INTERFACES"; then
-			# NEW v.0.5.3 Use ip instead of ifconfig
-			#MAC_ADDRESS_NUMBER=$(ifconfig $O_DEVICE | grep -o -E '([[:xdigit:]]{1,2}:){5}[[:xdigit:]]{1,2}')
 			MAC_ADDRESS_NUMBER=$(ip -o link show $O_DEVICE | cut -d ' ' -f 2,20 | grep -o -E '([[:xdigit:]]{1,2}:){5}[[:xdigit:]]{1,2}')
 			echo -e "Interface: ${RED}$O_DEVICE${NOCOLOR} - status: ${RED}$MAC_usb0${NOCOLOR} - current MAC: ${RED}$MAC_ADDRESS_NUMBER${NOCOLOR}"
 		fi

bin/find_domains

@@ -104,26 +104,21 @@ do
 				# THIS WILL BREAK!! -> (IFS=' ' read -ra IP_ARRAY <<< "$IP_LIST") &>/dev/null
 				IFS=' ' read -ra IP_ARRAY <<< "$IP_LIST"
 				for IP in "${IP_ARRAY[@]}"; do
-					#REMOVE COMMENT IF NOT NEEDED: #if ! grep -q -E "$IP" <<< "$NEW_STRING"; then
 					if ! grep -q "$IP" <<< "${NEW_STRING[*]}"; then
-						#REMOVE COMMENT IF NOT NEEDED: NEW_STRING=$(sed "s/[[:space:]]$SUBDOMAIN/[[:space:]]$SUBDOMAIN[[:space:]]$IP/g" <<< "$NEW_STRING");
 						NEW_STRING=$(sed -E "s/[[:space:]]${SUBDOMAIN}/[[:space:]]${SUBDOMAIN}[[:space:]]$IP/g" <<< "$NEW_STRING");
 					fi
 				done
 			# The domain isn't in "NEW_STRING" yet
 			else
 				IFS=' ' read -ra IP_ARRAY <<< "$IP_LIST"
 				for IP in "${IP_ARRAY[@]}"; do
-					#REMOVE COMMENT IF NOT NEEDED: #if ! grep -q -E "$IP" <<< "$NEW_STRING"; then
 					if ! grep -q "$IP" <<< "${NEW_STRING[*]}"; then
 						NEW_STRING="$NEW_STRING $SUBDOMAIN $IP_LIST\n"
 					fi
 				done
 			fi
 		done
 		# Matching routine stop
-
-    # NEW v.0.5.3
     unset DUMP_ARRAY
 		readarray -t DUMP_ARRAY< <(printf %s"${NEW_STRING}")
 		# Display the result
@@ -133,7 +128,6 @@ do
 		echo -e "${YELLOW}Domain IP${NOCOLOR}"
 		echo "---------"
 		SAMMEL_IP=""
-		# FIX post-v.0.5.3 - changed from i=0 to index=0 because of possible interferences from other functions
 		index=0
 		for DUMP_STRING in "${DUMP_ARRAY[@]}"
 		do
@@ -144,7 +138,6 @@ do
 			# If we have two lines with the same "SUBDOMAIN", so it's because of that command
 			# In this case, we have to implement a matching routine, as we did above
 			if [ ! -z "$SUBDOMAIN" ]; then
-				# NEW post-v.0.5.3
 				ping -c 1 -q $SUBDOMAIN >&/dev/null
 				OCHECK=$?
 				if [ ! $OCHECK -eq 0 ]; then

bin/hostapd_fallback_komplex_part_1

@@ -70,34 +70,28 @@ fi
 # pgrep -f "dhclient.$INTERFACE1" will only return true, if the Internet is on INTERFACE1
 # no need to change anything if INTERFACE1 was already the AP
 #
-# NEW v.0.5.0
-# New: we have also to take down the Interface with the old AP to avoid that the IP address (192.168.4x.1) is given twice
+# We have also to take down the Interface with the old AP to avoid that the IP address (192.168.4x.1) is given twice
 # ATTENTION: If this will disconnect the clients or hang TorBox then dhclient has to be removed.
-# NEW v.0.5.3:
 # ATTENTION: Under Raspberry Pi OS we can grep dhclient, but under Debian that's not possible because dclient is started on
 #            all interfaces. We have to avoid to take down the interface with the AP!
 
 if pgrep -f "dhclient.$INTERFACE1" ; then
 	(sudo dhclient -r) 2>&1
-	# NEW v.0.5.3 We can only do that, if the interface is not used as AP
+	# We can only do that, if the interface is not used as AP
 	if ! grep "^interface=$INTERFACE1" ${HOSTAPD} ; then
 		sudo ifdown $INTERFACE1
 		INTERFACE1_DOWN=1
 	fi
 	if ! grep "^interface=$INTERFACE3" ${HOSTAPD} ; then
-		# New v.0.5.0 hast to be tested
 		sudo ifdown $INTERFACE3
 		INTERFACE3_DOWN=1
 	fi
-	###
 fi
 
 if pgrep -f "dhclient.$INTERFACE2" ; then
 	(sudo dhclient -r) 2>&1
 	sudo ifdown $INTERFACE2
-	# New v.0.5.0 hast to be tested
 	sudo ifdown $INTERFACE4
-	###
 	INTERFACE2_DOWN=1
 fi
 
@@ -111,17 +105,13 @@ if [ $INTERFACE1_DOWN = 1 ] ; then
 fi
 
 if [ $INTERFACE3_DOWN = 1 ] ; then
-		# New v.0.5.0 hast to be tested
 		sudo ifup $INTERFACE3
 		INTERFACE3_DOWN=0
-		###
 fi
 
 if [ $INTERFACE2_DOWN = 1 ] ; then
 		sudo ifup $INTERFACE2
-		# New v.0.5.0 hast to be tested
 		sudo ifup $INTERFACE4
-		###
 		INTERFACE2_DOWN=0
 fi
 

bin/hostapd_fallback_komplex_part_2

@@ -106,10 +106,3 @@ fi
 # This function has to be used after an ifup command
 # Important: the right iptables rules to use Tor have to configured afterward
 sudo systemctl restart isc-dhcp-server
-
-# NEW v.0.5.3 - not necessary - all iptables config should only be done in set_interfaces_x
-#sudo /sbin/iptables -F
-#sudo /sbin/iptables -t nat -F
-#sudo /sbin/iptables -P FORWARD DROP
-#sudo /sbin/iptables -P INPUT ACCEPT
-#sudo /sbin/iptables -P OUTPUT ACCEPT

bin/restore

@@ -201,7 +201,7 @@ if (whiptail --title "TorBox - INFO (scroll down!)" --scrolltext --yesno "$INPUT
 
 			# Please, choose with SPACE which data you want to restore
       if [ "$OBFS4RELAY" == "1" ] || [ "$ONIONSERVICES" == "1" ] || [ "$ONIONAUTH" == "1" ] || [ "$SHAREDFOLDERS" == "1" ]; then
-				WHIPTAIL_LINE="whiptail --nocancel --title \"TorBox v.0.5.3 - RESTORE SELECTION\" --checklist --separate-output \"\nPlease, choose with SPACE which data you want to restore in addition to the TorBox configuration and press ENTER (ESC -> go back).\n\nIMPORTANT: The old configuration will be deleted in ANY CASE!\n\" $MENU_HEIGHT_15 $MENU_WIDTH 4"
+				WHIPTAIL_LINE="whiptail --nocancel --title \"TorBox v.0.5.4 - RESTORE SELECTION\" --checklist --separate-output \"\nPlease, choose with SPACE which data you want to restore in addition to the TorBox configuration and press ENTER (ESC -> go back).\n\nIMPORTANT: The old configuration will be deleted in ANY CASE!\n\" $MENU_HEIGHT_15 $MENU_WIDTH 4"
 				i=0
 				n=0
 				if [ "$OBFS4RELAY" == "1" ]; then

bin/set_interfaces_2

@@ -97,7 +97,7 @@ captive_tunneling()
 	if [ $EXITLOOP == 0 ]; then
 		echo -e "${RED}[+] Restarting the network...${NOCOLOR}"
 		echo ""
-		# TEST: that should improve the connectivity with the captive portal
+		# That should improve the connectivity with the captive portal
 		sudo ifdown $O_DEVICE
 		# The next line should help TorBox to forget the old IP
 		ip addr flush dev $O_DEVICE
@@ -118,11 +118,6 @@ captive_tunneling()
 	fi
 }
 
-# NEW v.0.5.3 - Not necessary
-###### WE WILL DEACTIVATE BRIDGE RELAY MODE FIRST ######
-#clear
-#[ "$ONLY_RESET" != "1" ] && deactivating_bridge_relay
-
 ###### ADDITIONAL COMMANDS DEPENDED ON THE INTERFACE CONNECTED TO THE INTERNET ######
 while [ $EXITLOOP == 0 ] && [ "$ONLY_RESET" != "1" ]; do
 	if [ "$O_DEVICE" = "wlan0" ] || [ "$O_DEVICE" = "wlan1" ]; then

bin/start_tcs

@@ -86,10 +86,8 @@ if [ $n -gt 0 ] ; then
 			else
 				echo -e "${RED}[+] Removing TCS configuration...${NOCOLOR}"
 				sudo sed -i "/^TCS-${SERVICE_NAME}/d" "${RUNFILE}"
-				# NEW - TorBox v.0.5.3
 				(sudo rm $DB_PATH/$SERVICE_NAME.*) &>/dev/null
 				(sudo rm /var/run/tcs_$SERVICE_NAME.sock) &>/dev/null
-				#
 				echo -e "${RED}[+] Removing Nginx configuration...${NOCOLOR}"
 				find_virtport "${SERVICE_NAME}"
 				(sudo rm "${NGINX_DIR}/sites-enabled/${SERVICE_NAME}-${VIRTPORT}-onion-chatsecure.conf") &>/dev/null

etc/dhcp/dhclient.conf

@@ -23,5 +23,4 @@ request subnet-mask, broadcast-address, time-offset, routers,
 	dhcp6.name-servers, dhcp6.domain-search, dhcp6.fqdn, dhcp6.sntp-servers,
 	netbios-name-servers, netbios-scope, interface-mtu, ntp-servers;
 
-	# New v.0.5.3 timeout 60 -> 30
 	timeout 30;

etc/hostapd/hostapd.conf

@@ -7,7 +7,7 @@
 
 interface=wlan0
 driver=nl80211
-ssid=TorBox053
+ssid=TorBox054
 country_code=US
 hw_mode=g
 channel=6