mirror of
https://github.com/pi-hole/pi-hole
synced 2024-12-22 14:58:08 +00:00
Merge pull request #1757 from Mausy5043/development
Various small fixes
This commit is contained in:
commit
f63267a7f9
@ -218,7 +218,7 @@ elif command -v rpm &> /dev/null; then
|
||||
LIGHTTPD_CFG="lighttpd.conf.fedora"
|
||||
DNSMASQ_USER="nobody"
|
||||
|
||||
# If neither apt-get or rmp/dnf are not found
|
||||
# If neither apt-get or rmp/dnf are found
|
||||
else
|
||||
# it's not an OS we can support,
|
||||
echo -e " ${CROSS} OS distribution not supported"
|
||||
@ -1262,14 +1262,14 @@ install_dependent_packages() {
|
||||
installArray+=("${i}")
|
||||
fi
|
||||
done
|
||||
#
|
||||
if [[ "${#installArray[@]}" -gt 0 ]]; then
|
||||
#
|
||||
if [[ "${#installArray[@]}" -gt 0 ]]; then
|
||||
#
|
||||
"${PKG_INSTALL[@]}" "${installArray[@]}" &> /dev/null
|
||||
return
|
||||
fi
|
||||
echo ""
|
||||
return 0
|
||||
"${PKG_INSTALL[@]}" "${installArray[@]}" &> /dev/null
|
||||
return
|
||||
fi
|
||||
echo ""
|
||||
return 0
|
||||
}
|
||||
|
||||
# Create logfiles if necessary
|
||||
@ -1670,14 +1670,14 @@ update_dialogs() {
|
||||
"${opt2a}" "${opt2b}" 3>&2 2>&1 1>&3) || \
|
||||
{ echo -e " ${COL_LIGHT_RED}Cancel was selected, exiting installer${COL_NC}"; exit 1; }
|
||||
|
||||
# Set the variable based on if the user user chooses
|
||||
# Set the variable based on if the user chooses
|
||||
case ${UpdateCmd} in
|
||||
# repair, or
|
||||
${opt1a})
|
||||
echo -e " ${INFO} ${opt1a} option selected"
|
||||
useUpdateVars=true
|
||||
;;
|
||||
# recongigure,
|
||||
# reconfigure,
|
||||
${opt2a})
|
||||
echo -e " ${INFO} ${opt2a} option selected"
|
||||
useUpdateVars=false
|
||||
|
Loading…
Reference in New Issue
Block a user