Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-15 02:42:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

changed flag and variable name

Browse source 
Signed-off-by: RamSet <RamSet@gmail.com>
This commit is contained in:
RamSet 2018-07-17 18:04:50 -06:00
parent 3098f32a07
commit 49c79405bc
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
automated install/basic-install.sh
View file

@ -86,16 +86,16 @@ skipSpaceCheck=false
reconfigure=false reconfigure=false
runUnattended=false runUnattended=false
INSTALL_WEB_SERVER=true INSTALL_WEB_SERVER=true
forceFTLDNS=false skipDNSPortCheck=false
# Check arguments for the undocumented flags # Check arguments for the undocumented flags
for var in "$@"; do for var in "$@"; do
case "$var" in case "$var" in
"--reconfigure" ) reconfigure=true forceFTLDNS=true;; "--reconfigure" ) reconfigure=true skipDNSPortCheck=true;;
"--i_do_not_follow_recommendations" ) skipSpaceCheck=true;; "--i_do_not_follow_recommendations" ) skipSpaceCheck=true;;
"--unattended" ) runUnattended=true;; "--unattended" ) runUnattended=true;;
"--disable-install-webserver" ) INSTALL_WEB_SERVER=false;; "--disable-install-webserver" ) INSTALL_WEB_SERVER=false;;
"--forceFTLDNS" ) forceFTLDNS=true;; "--skip-DNS-port-check" ) skipDNSPortCheck=true;;
esac esac
done done
@ -173,7 +173,7 @@ port_53_check(){
# (after packages and dependencies are installed). # (after packages and dependencies are installed).
# dnsmasq will be disabled at end of install, prior to FTLDNS start. # dnsmasq will be disabled at end of install, prior to FTLDNS start.
echo -e " ${EXCL} Port 53 is in use by ${COL_LIGHT_RED}$who53${COL_NC}." echo -e " ${EXCL} Port 53 is in use by ${COL_LIGHT_RED}$who53${COL_NC}."
echo -e " --forceFTLDNS flag was used. The installer ${COL_LIGHT_RED}will disable $who53${COL_NC} after dependencies and packages" echo -e " --skip-DNS-port-check flag was used. The installer ${COL_LIGHT_RED}will disable $who53${COL_NC} after dependencies and packages"
echo -e " have been downloaded, and replace dnsmasq with FTLDNS." echo -e " have been downloaded, and replace dnsmasq with FTLDNS."
dnsmasq_flag=true dnsmasq_flag=true
elif [ "$who53" = "dnsmasq" ] && [[ $forceFTLDNS = "false" ]]; then elif [ "$who53" = "dnsmasq" ] && [[ $forceFTLDNS = "false" ]]; then
@ -183,14 +183,14 @@ port_53_check(){
echo -e " ${EXCL} Port 53 is in use by ${COL_LIGHT_RED}$who53${COL_NC}." echo -e " ${EXCL} Port 53 is in use by ${COL_LIGHT_RED}$who53${COL_NC}."
echo -e " In order for the installer to proceed, ${COL_LIGHT_RED}$who53${COL_NC} needs to be disabled." echo -e " In order for the installer to proceed, ${COL_LIGHT_RED}$who53${COL_NC} needs to be disabled."
echo -e " Please re-run the installer with the following command:" echo -e " Please re-run the installer with the following command:"
echo -e " ${COL_LIGHT_CYAN}curl -sSL https://install.pi-hole.net | bash -s -- --forceFTLDNS${COL_NC}" echo -e " ${COL_LIGHT_CYAN}curl -sSL https://install.pi-hole.net | bash -s -- --skip-DNS-port-check${COL_NC}"
exit 0 exit 0
elif [ "$who53" = "systemd-resolve" ] && [[ $forceFTLDNS = "true" ]]; then elif [ "$who53" = "systemd-resolve" ] && [[ $forceFTLDNS = "true" ]]; then
# If systemd-resolved is present, set the systemd-resolved-flag to true for future reference # If systemd-resolved is present, set the systemd-resolved-flag to true for future reference
# (after packages and dependencies are installed). # (after packages and dependencies are installed).
# systemd-resolved will be disabled at end of install, prior to FTLDNS start. # systemd-resolved will be disabled at end of install, prior to FTLDNS start.
echo -e " ${EXCL} Port 53 is in use by ${COL_LIGHT_RED}$who53${COL_NC}." echo -e " ${EXCL} Port 53 is in use by ${COL_LIGHT_RED}$who53${COL_NC}."
echo -e " --forceFTLDNS flag was used. The installer ${COL_LIGHT_RED}will disable $who53${COL_NC} after dependencies and packages" echo -e " --skip-DNS-port-check flag was used. The installer ${COL_LIGHT_RED}will disable $who53${COL_NC} after dependencies and packages"
echo -e " have been downloaded, and replace the system DNS resolver with FTLDNS." echo -e " have been downloaded, and replace the system DNS resolver with FTLDNS."
systemd_resolved_flag=true systemd_resolved_flag=true
elif [ "$who53" = "systemd-resolve" ] && [[ $forceFTLDNS = "false" ]]; then elif [ "$who53" = "systemd-resolve" ] && [[ $forceFTLDNS = "false" ]]; then
@ -200,7 +200,7 @@ port_53_check(){
echo -e " ${EXCL} Port 53 is in use by ${COL_LIGHT_RED}$who53${COL_NC}." echo -e " ${EXCL} Port 53 is in use by ${COL_LIGHT_RED}$who53${COL_NC}."
echo -e " In order for the installer to proceed, ${COL_LIGHT_RED}$who53${COL_NC} needs to be disabled." echo -e " In order for the installer to proceed, ${COL_LIGHT_RED}$who53${COL_NC} needs to be disabled."
echo -e " Please re-run the installer with the following command:" echo -e " Please re-run the installer with the following command:"
echo -e " ${COL_LIGHT_CYAN}curl -sSL https://install.pi-hole.net | bash -s -- --forceFTLDNS${COL_NC}" echo -e " ${COL_LIGHT_CYAN}curl -sSL https://install.pi-hole.net | bash -s -- --skip-DNS-port-check${COL_NC}"
exit 0 exit 0
else else
# Port 53 is used by something else, stop install # Port 53 is used by something else, stop install
@ -2013,7 +2013,7 @@ update_dialogs() {
${opt1a}) ${opt1a})
echo -e " ${INFO} ${opt1a} option selected" echo -e " ${INFO} ${opt1a} option selected"
useUpdateVars=true useUpdateVars=true
forceFTLDNS=true skipDNSPortCheck=true
;; ;;
# reconfigure, # reconfigure,
${opt2a}) ${opt2a})