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

Bash is funny with returns.

Browse source
This commit is contained in:
Dan Schaper 2016-11-02 00:51:38 -07:00
parent 12f5f8ba00
commit d9528dfd09
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
advanced/Scripts/update.sh
View file

@ -25,7 +25,7 @@ is_repo() {
local gitRepo=0
echo -n "::: Checking if ${directory} is a repo... "
cd "${directory}" &> /dev/null || return 1
if [[ $(git status --short > /dev/null) ]]; then
if [[ $(git status --short &> /dev/null) ]]; then
echo "OK"
else
echo "not found!"
@ -63,12 +63,16 @@ getGitFiles() {
fi
}
if [ ! -d "/etc/.pihole" ]; then #This is unlikely
is_repo "${PI_HOLE_FILES_DIR}" &> /dev/null
if [[ $? -eq 1 ]]; then #This is unlikely
echo "::: Critical Error: Pi-Hole repo missing from system!"
echo "::: Please re-run install script from https://github.com/pi-hole/pi-hole"
exit 1;
fi
if [ ! -d "/var/www/html/admin" ]; then #This is unlikely
is_repo "${ADMIN_INTERFACE_DIR}" &> /dev/null
if [[ $? -eq 1 ]]; then #This is unlikely
echo "::: Critical Error: Pi-Hole repo missing from system!"
echo "::: Please re-run install script from https://github.com/pi-hole/pi-hole"
exit 1;

6
automated install/basic-install.sh
View file

@ -73,7 +73,7 @@ fi
# Compatibility
if [ -x "$(command -v apt-get)" ]; then
if [[ $(command -v apt-get) ]]; then
#Debian Family
#############################################
PKG_MANAGER="apt-get"
@ -99,9 +99,9 @@ if [ -x "$(command -v apt-get)" ]; then
package_check_install() {
dpkg-query -W -f='${Status}' "${1}" 2>/dev/null | grep -c "ok installed" || ${PKG_INSTALL} "${1}"
}
elif [ -x "$(command -v rpm)" ]; then
elif [ $(command -v rpm) ]; then
# Fedora Family
if [ -x "$(command -v dnf)" ]; then
if [ $(command -v dnf) ]; then
PKG_MANAGER="dnf"
else
PKG_MANAGER="yum"