From fadb886d300af9ee36016578909fe950eea89857 Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Wed, 2 Nov 2016 09:28:36 +0000 Subject: [PATCH] fix return on is_repo() function to stop it always returning 0 --- advanced/Scripts/update.sh | 10 +++++++++- automated install/basic-install.sh | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/advanced/Scripts/update.sh b/advanced/Scripts/update.sh index 372d6223..4c74eede 100644 --- a/advanced/Scripts/update.sh +++ b/advanced/Scripts/update.sh @@ -47,7 +47,15 @@ is_repo() { # Use git to check if directory is currently under VCS echo -n "::: Checking $1 is a repo..." 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() { diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index 4d74037d..90999703 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -759,7 +759,15 @@ is_repo() { # Use git to check if directory is currently under VCS echo -n "::: Checking $1 is a repo..." 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() {