diff --git a/advanced/Scripts/list.sh b/advanced/Scripts/list.sh index 24f6d055..5cee8b56 100644 --- a/advanced/Scripts/list.sh +++ b/advanced/Scripts/list.sh @@ -47,7 +47,7 @@ helpFunc() { ::: -h, --help Show this help dialog ::: -l, --list Display your ${word}listed domains EOM - exit 1 + exit 0 } HandleOther(){ diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index d79f05b2..d481c135 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -113,12 +113,12 @@ elif [ $(command -v rpm) ]; then PKG_UPDATE="${PKG_MANAGER} update -y" PKG_INSTALL="${PKG_MANAGER} install -y" PKG_COUNT="${PKG_MANAGER} check-update | egrep '(.i686|.x86|.noarch|.arm|.src)' | wc -l" - 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 ) + INSTALLER_DEPS=(iproute net-tools procps-ng newt git) + 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 - remove_deps=(epel-release); - PIHOLE_DEPS=( ${PIHOLE_DEPS[@]/$remove_deps} ); + if ! grep -q 'Fedora' /etc/redhat-release; then + add_deps=(epel-release); + PIHOLE_DEPS=( "${add_deps[@]}" "${PIHOLE_DEPS[@]}" ); fi LIGHTTPD_USER="lighttpd" LIGHTTPD_GROUP="lighttpd" diff --git a/gravity.sh b/gravity.sh index d05dddea..d6b7106b 100755 --- a/gravity.sh +++ b/gravity.sh @@ -23,7 +23,7 @@ helpFunc() { ::: -f, --force Force lists to be downloaded, even if they don't need updating. ::: -h, --help Show this help dialog EOM - exit 1 + exit 0 } diff --git a/pihole b/pihole index 771ab4c3..d8217fed 100755 --- a/pihole +++ b/pihole @@ -227,7 +227,7 @@ helpFunc() { ::: pihole disable 5m - will disable blocking for 5 minutes ::: restartdns Restart dnsmasq EOM - exit 1 + exit 0 } if [[ $# = 0 ]]; then