Begin fixing exit values.

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
pull/951/head
Dan Schaper 8 years ago
parent 1c64f1d0cf
commit 2ec4acfe52
No known key found for this signature in database
GPG Key ID: 572E999E385B7BFC

@ -47,7 +47,7 @@ helpFunc() {
::: -h, --help Show this help dialog ::: -h, --help Show this help dialog
::: -l, --list Display your ${word}listed domains ::: -l, --list Display your ${word}listed domains
EOM EOM
exit 1 exit 0
} }
HandleOther(){ HandleOther(){

@ -113,12 +113,12 @@ elif [ $(command -v rpm) ]; then
PKG_UPDATE="${PKG_MANAGER} update -y" PKG_UPDATE="${PKG_MANAGER} update -y"
PKG_INSTALL="${PKG_MANAGER} install -y" PKG_INSTALL="${PKG_MANAGER} install -y"
PKG_COUNT="${PKG_MANAGER} check-update | egrep '(.i686|.x86|.noarch|.arm|.src)' | wc -l" PKG_COUNT="${PKG_MANAGER} check-update | egrep '(.i686|.x86|.noarch|.arm|.src)' | wc -l"
INSTALLER_DEPS=( iproute net-tools procps-ng newt git ) INSTALLER_DEPS=(iproute net-tools procps-ng newt git)
PIHOLE_DEPS=( epel-release bind-utils bc dnsmasq lighttpd lighttpd-fastcgi php-common php-cli php curl unzip wget findutils cronie sudo nmap-ncat ) PIHOLE_DEPS=(bind-utils bc dnsmasq lighttpd lighttpd-fastcgi php-common php-cli php curl unzip wget findutils cronie sudo nmap-ncat)
if grep -q 'Fedora' /etc/redhat-release; then if ! grep -q 'Fedora' /etc/redhat-release; then
remove_deps=(epel-release); add_deps=(epel-release);
PIHOLE_DEPS=( ${PIHOLE_DEPS[@]/$remove_deps} ); PIHOLE_DEPS=( "${add_deps[@]}" "${PIHOLE_DEPS[@]}" );
fi fi
LIGHTTPD_USER="lighttpd" LIGHTTPD_USER="lighttpd"
LIGHTTPD_GROUP="lighttpd" LIGHTTPD_GROUP="lighttpd"

@ -23,7 +23,7 @@ helpFunc() {
::: -f, --force Force lists to be downloaded, even if they don't need updating. ::: -f, --force Force lists to be downloaded, even if they don't need updating.
::: -h, --help Show this help dialog ::: -h, --help Show this help dialog
EOM EOM
exit 1 exit 0
} }

@ -227,7 +227,7 @@ helpFunc() {
::: pihole disable 5m - will disable blocking for 5 minutes ::: pihole disable 5m - will disable blocking for 5 minutes
::: restartdns Restart dnsmasq ::: restartdns Restart dnsmasq
EOM EOM
exit 1 exit 0
} }
if [[ $# = 0 ]]; then if [[ $# = 0 ]]; then

Loading…
Cancel
Save