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

Align dialog texts.

Browse source 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
This commit is contained in:
Dan Schaper 2022-07-02 12:36:16 -07:00
parent bf57a786e6
commit 1ed5ff306d
1 changed files with 39 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
automated install/basic-install.sh
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
@ -431,7 +431,7 @@ select_rpm_php(){
--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}"
@ -703,7 +703,7 @@ welcomeDialogs() {
--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}"
@ -873,7 +873,7 @@ 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."\
@ -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 \