|
|
@ -673,7 +673,7 @@ chooseInterface() {
|
|
|
|
# Feed the available interfaces into this while loop
|
|
|
|
# Feed the available interfaces into this while loop
|
|
|
|
done <<< "${availableInterfaces}"
|
|
|
|
done <<< "${availableInterfaces}"
|
|
|
|
# The whiptail command that will be run, stored in a variable
|
|
|
|
# The whiptail command that will be run, stored in a variable
|
|
|
|
chooseInterfaceCmd=(whiptail --separate-output --radiolist "Choose An Interface (press space to select)" "${r}" "${c}" "${interfaceCount}")
|
|
|
|
chooseInterfaceCmd=(whiptail --separate-output --radiolist "Choose An Interface (press space to toggle selection)" "${r}" "${c}" "${interfaceCount}")
|
|
|
|
# Now run the command using the interfaces saved into the array
|
|
|
|
# Now run the command using the interfaces saved into the array
|
|
|
|
chooseInterfaceOptions=$("${chooseInterfaceCmd[@]}" "${interfacesArray[@]}" 2>&1 >/dev/tty) || \
|
|
|
|
chooseInterfaceOptions=$("${chooseInterfaceCmd[@]}" "${interfacesArray[@]}" 2>&1 >/dev/tty) || \
|
|
|
|
# If the user chooses Cancel, exit
|
|
|
|
# If the user chooses Cancel, exit
|
|
|
@ -763,8 +763,8 @@ use4andor6() {
|
|
|
|
# Named local variables
|
|
|
|
# Named local variables
|
|
|
|
local useIPv4
|
|
|
|
local useIPv4
|
|
|
|
local useIPv6
|
|
|
|
local useIPv6
|
|
|
|
# Let use select IPv4 and/or IPv6 via a checklist
|
|
|
|
# Let user choose IPv4 and/or IPv6 via a checklist
|
|
|
|
cmd=(whiptail --separate-output --checklist "Select Protocols (press space to select)" "${r}" "${c}" 2)
|
|
|
|
cmd=(whiptail --separate-output --checklist "Select Protocols (press space to toggle selection)" "${r}" "${c}" 2)
|
|
|
|
# In an array, show the options available:
|
|
|
|
# In an array, show the options available:
|
|
|
|
# IPv4 (on by default)
|
|
|
|
# IPv4 (on by default)
|
|
|
|
options=(IPv4 "Block ads over IPv4" on
|
|
|
|
options=(IPv4 "Block ads over IPv4" on
|
|
|
|