tyler.durden
/
pi-hole
mirror of https://github.com/pi-hole/pi-hole.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix return on is_repo() function to stop it always returning 0

This commit is contained in:
Adam Warner 2016-11-02 09:28:36 +00:00
parent 45f04b8a11
commit fadb886d30
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
advanced/Scripts/update.sh
View File

@ -47,7 +47,15 @@ is_repo() {
# Use git to check if directory is currently under VCS # Use git to check if directory is currently under VCS
echo -n "::: Checking $1 is a repo..." echo -n "::: Checking $1 is a repo..."
cd "${1}" &> /dev/null || return 1 cd "${1}" &> /dev/null || return 1
git status &> /dev/null && echo " OK!"; return 0 || echo " not found!"; return 1 git status &> /dev/null
if [[ $? == 0 ]]; then
echo " OK!"
return 0
else
echo " not found!"
return 1
fi
} }
make_repo() { make_repo() {

10
automated install/basic-install.sh
View File

@ -759,7 +759,15 @@ is_repo() {
# Use git to check if directory is currently under VCS # Use git to check if directory is currently under VCS
echo -n "::: Checking $1 is a repo..." echo -n "::: Checking $1 is a repo..."
cd "${1}" &> /dev/null || return 1 cd "${1}" &> /dev/null || return 1
git status &> /dev/null && echo " OK!"; return 0 || echo " not found!"; return 1 git status &> /dev/null
if [[ $? == 0 ]]; then
echo " OK!"
return 0
else
echo " not found!"
return 1
fi
} }
make_repo() { make_repo() {