arno
/
pi-hole
mirror of https://github.com/pi-hole/pi-hole
1
0
Fork 0
Code Issues Releases Wiki Activity

Align dialog texts.

Browse Source 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
pull/4781/head
Dan Schaper 2 years ago
parent bf57a786e6
commit 1ed5ff306d
1 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File

78
automated install/basic-install.sh
Unescape View File

@ -101,7 +101,7 @@ if [ -z "${USER}" ]; then
USER="$(id -un)" USER="$(id -un)"
fi fi
# dialog dimensions: 20 rows and 70 chars width assures to fit on small screens and is known to hold all content. # dialog dimensions: Let dialog handle appropriate sizing.
r=20 r=20
c=70 c=70
@ -430,9 +430,9 @@ select_rpm_php(){
dialog --no-shadow --clear \ dialog --no-shadow --clear \
--title "PHP 7 Update (recommended)" \ --title "PHP 7 Update (recommended)" \
--defaultno \ --defaultno \
--yesno "PHP 7.x is recommended for both security and language features. \ --yesno "PHP 7.x is recommended for both security and language features.\
\\nWould you like to install PHP7 via Remi's RPM repository? \ \\n\\nWould you like to install PHP7 via Remi's RPM repository?\
\\n\\nSee: https://rpms.remirepo.net for more information" \ \\n\\nSee: https://rpms.remirepo.net for more information"\
"${r}" "${c}" "${r}" "${c}"
result=$? result=$?
@ -474,9 +474,9 @@ select_rpm_php(){
--defaultno \ --defaultno \
--no-button "Exit" \ --no-button "Exit" \
--yes-button "Continue" \ --yes-button "Continue" \
--yesno "Would you like to continue installation on an unsupported RPM based distribution? \ --yesno "Would you like to continue installation on an unsupported RPM based distribution?\
\\n\\nPlease ensure the following packages have been installed manually: \ \\n\\nPlease ensure the following packages have been installed manually:\
\\n\\n- lighttpd\\n- lighttpd-fastcgi\\n- PHP version 7+" \ \\n\\n- lighttpd\\n- lighttpd-fastcgi\\n- PHP version 7+"\
"${r}" "${c}" "${r}" "${c}"
result=$? result=$?
@ -702,10 +702,10 @@ welcomeDialogs() {
--title "Static IP Needed" \ --title "Static IP Needed" \
--no-button "Exit" --yes-button "Continue" \ --no-button "Exit" --yes-button "Continue" \
--defaultno \ --defaultno \
--yesno "\\n\\nThe Pi-hole is a SERVER so it needs a STATIC IP ADDRESS to function properly.\\n\\n \ --yesno "\\n\\nThe Pi-hole is a SERVER so it needs a STATIC IP ADDRESS to function properly.\\n\\n\
\\Zb\\Z1IMPORTANT:\\Zn If you have not already done so, you must ensure that this device has a static IP.\\n \ \\Zb\\Z1IMPORTANT:\\Zn If you have not already done so, you must ensure that this device has a static IP.\\n\\n\
Depending on your operating system, there are many ways to achieve this, through DHCP reservation, or by manually assigning one.\\n\\n \ Depending on your operating system, there are many ways to achieve this, through DHCP reservation, or by manually assigning one.\\n\\n\
Please continue when the static addressing has been configured." \ Please continue when the static addressing has been configured."\
"${r}" "${c}" "${r}" "${c}"
result=$? result=$?
@ -873,10 +873,10 @@ getStaticIPv4Settings() {
dialog --no-shadow --clear \ dialog --no-shadow --clear \
--backtitle "IP information" \ --backtitle "IP information" \
--title "FYI: IP Conflict" \ --title "FYI: IP Conflict" \
--msgbox "\\nIt is possible your router could still try to assign this IP to a device, which would cause a conflict. \ --msgbox "\\nIt is possible your router could still try to assign this IP to a device, which would cause a conflict\
But in most cases the router is smart enough to not do that. \ But in most cases the router is smart enough to not do that.\
If you are worried, either manually set the address, or modify the DHCP reservation pool so it does not include the IP you want. \ If you are worried, either manually set the address, or modify the DHCP reservation pool so it does not include the IP you want.\
It is also possible to use a DHCP reservation, but if you are going to do that, you might as well set a static address." \ It is also possible to use a DHCP reservation, but if you are going to do that, you might as well set a static address."\
"${r}" "${c}" "${r}" "${c}"
result=$? result=$?
@ -1066,9 +1066,9 @@ setDNS() {
# Prompt the user to enter custom upstream servers # Prompt the user to enter custom upstream servers
piholeDNS=$(dialog --no-shadow --clear --output-fd 1 \ piholeDNS=$(dialog --no-shadow --clear --output-fd 1 \
--backtitle "Specify Upstream DNS Provider(s)" \ --backtitle "Specify Upstream DNS Provider(s)" \
--inputbox "Enter your desired upstream DNS provider(s), separated by a comma. \ --inputbox "Enter your desired upstream DNS provider(s), separated by a comma.\
If you want to specify a port other than 53, separate it with a hash. \ If you want to specify a port other than 53, separate it with a hash.\
\\n\\nFor example '8.8.8.8, 8.8.4.4' or '127.0.0.1#5335'" \ \\n\\nFor example '8.8.8.8, 8.8.4.4' or '127.0.0.1#5335'"\
"${r}" "${c}" "${prePopulate}") "${r}" "${c}" "${prePopulate}")
result=$? result=$?
@ -1100,8 +1100,8 @@ setDNS() {
dialog --no-shadow --clear \ dialog --no-shadow --clear \
--title "Invalid IP Address(es)" \ --title "Invalid IP Address(es)" \
--backtitle "Invalid IP" \ --backtitle "Invalid IP" \
--msgbox "\\nOne or both of the entered IP addresses were invalid. Please try again. \ --msgbox "\\nOne or both of the entered IP addresses were invalid. Please try again.\
\\n\\nInvalid IPs: ${PIHOLE_DNS_1}, ${PIHOLE_DNS_2}" \ \\n\\nInvalid IPs: ${PIHOLE_DNS_1}, ${PIHOLE_DNS_2}" \
"${r}" "${c}" "${r}" "${c}"
result=$? result=$?
@ -1199,10 +1199,10 @@ setLogging() {
# Allow the user to set their FTL privacy level # Allow the user to set their FTL privacy level
setPrivacyLevel() { setPrivacyLevel() {
# The default selection is level 0
PRIVACY_LEVEL=$(dialog --no-shadow --clear --output-fd 1 \ PRIVACY_LEVEL=$(dialog --no-shadow --clear --output-fd 1 \
--radiolist "Select a privacy mode for FTL. https://docs.pi-hole.net/ftldns/privacylevels/" \ --radiolist "Select a privacy mode for FTL. https://docs.pi-hole.net/ftldns/privacylevels/" \
"${r}" "${c}" 6 \ "${r}" "${c}" 6 \
# The default selection is level 0
"0" "Show everything" on \ "0" "Show everything" on \
"1" "Hide domains" off \ "1" "Hide domains" off \
"2" "Hide domains and clients" off \ "2" "Hide domains and clients" off \
@ -1259,12 +1259,12 @@ setAdminFlag() {
dialog --no-shadow --clear \ dialog --no-shadow --clear \
--backtitle "Pi-hole Installation" \ --backtitle "Pi-hole Installation" \
--title "Web Server" \ --title "Web Server" \
--yesno "\\n\\nA web server is required for the Admin Web Interface. \ --yesno "\\n\\nA web server is required for the Admin Web Interface.\
\\n\\nDo you want to install lighttpd and the required PHP modules? \ \\n\\nDo you want to install lighttpd and the required PHP modules?\
\\n\\nNB: If you disable this, and, do not have an existing web server \ \\n\\nNB: If you disable this, and, do not have an existing web server\
and required PHP modules (${php_modules# }) installed, the web interface \ and required PHP modules (${php_modules# }) installed, the web interface\
will not function. Additionally the web server user needs to be member of \ will not function. Additionally the web server user needs to be member of\
the \"pihole\" group for full functionality." \ the \"pihole\" group for full functionality." \
"${r}" "${c}" "${r}" "${c}"
result=$? result=$?
@ -1300,10 +1300,10 @@ chooseBlocklists() {
dialog --no-shadow --clear \ dialog --no-shadow --clear \
--backtitle "Pi-hole Installation" \ --backtitle "Pi-hole Installation" \
--title "Blocklists" \ --title "Blocklists" \
--yesno "\\nPi-hole relies on third party lists in order to block ads. \ --yesno "\\nPi-hole relies on third party lists in order to block ads.\
\\n\\nYou can use the suggestion below, and/or add your own after installation. \ \\n\\nYou can use the suggestion below, and/or add your own after installation.\
\\n\\nSelect 'Yes' to include: \ \\n\\nSelect 'Yes' to include:\
\\n\\nStevenBlack's Unified Hosts List" \ \\n\\nStevenBlack's Unified Hosts List" \
"${r}" "${c}" "${r}" "${c}"
result=$? result=$?
@ -2112,11 +2112,11 @@ Your Admin Webpage login password is ${pwstring}"
# Final completion message to user # Final completion message to user
dialog --no-shadow --clear \ dialog --no-shadow --clear \
--title "Installation Complete!" \ --title "Installation Complete!" \
--msgbox "Configure your devices to use the Pi-hole as their DNS server using: \ --msgbox "Configure your devices to use the Pi-hole as their DNS server using:\
\\n\\nIPv4: ${IPV4_ADDRESS%/*} \ \\n\\nIPv4: ${IPV4_ADDRESS%/*}\
\\nIPv6: ${IPV6_ADDRESS:-"Not Configured"} \ \\nIPv6: ${IPV6_ADDRESS:-"Not Configured"}\
\\nIf you have not done so already, the above IP should be set to static. \ \\nIf you have not done so already, the above IP should be set to static.\
\\n${additional}" \\n${additional}"
"${r}" "${c}" "${r}" "${c}"
} }
@ -2139,9 +2139,9 @@ update_dialogs() {
# Display the information to the user # Display the information to the user
UpdateCmd=$(dialog --no-shadow --clear --output-fd 1 \ UpdateCmd=$(dialog --no-shadow --clear --output-fd 1 \
--title "Existing Install Detected!" \ --title "Existing Install Detected!" \
--menu "\\n\\nWe have detected an existing install. \ --menu "\\n\\nWe have detected an existing install.\
\\n\\nPlease choose from the following options: \ \\n\\nPlease choose from the following options:\
\\n($strAdd)" \ \\n($strAdd)"\
"${r}" "${c}" 2 \ "${r}" "${c}" 2 \
"${opt1a}" "${opt1b}" \ "${opt1a}" "${opt1b}" \
"${opt2a}" "${opt2b}") "${opt2a}" "${opt2b}")

Write Preview
Loading…
Cancel
Save