From 4512edff0d5cd29ffc9ed0d55bcf3e8653678c63 Mon Sep 17 00:00:00 2001 From: kjeld Schouten-Lebbing Date: Sun, 24 May 2020 23:11:33 +0200 Subject: [PATCH 1/2] devnull all the things, we do our own messages --- global.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/global.sh b/global.sh index b22fbff5..07dd4039 100755 --- a/global.sh +++ b/global.sh @@ -26,15 +26,15 @@ parse_yaml() { gitupdate() { git remote add upstream https://github.com/jailmanager/jailman.git > /dev/null 2>&1 echo "checking for updates using Branch: $1" -git fetch upstream -git update-index -q --refresh -CHANGED=$(git diff --name-only "$1") +git fetch upstream > /dev/null 2>&1 +git update-index -q --refresh > /dev/null 2>&1 +CHANGED=$(git diff --name-only "$1") > /dev/null 2>&1 if [ -n "$CHANGED" ]; then echo "script requires update" - git reset --hard - git checkout "${1}" - git pull + git reset --hard > /dev/null 2>&1 + git checkout "${1}" > /dev/null 2>&1 + git pull > /dev/null 2>&1 echo "script updated, please restart the script manually" exit 1 else From 13be3ca313b90244b3b61d38eca729e227ce2d40 Mon Sep 17 00:00:00 2001 From: kjeld Schouten-Lebbing Date: Sun, 24 May 2020 23:12:31 +0200 Subject: [PATCH 2/2] dont /dev/null variable, oops --- global.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.sh b/global.sh index 07dd4039..37a1d607 100755 --- a/global.sh +++ b/global.sh @@ -28,7 +28,7 @@ git remote add upstream https://github.com/jailmanager/jailman.git > /dev/null 2 echo "checking for updates using Branch: $1" git fetch upstream > /dev/null 2>&1 git update-index -q --refresh > /dev/null 2>&1 -CHANGED=$(git diff --name-only "$1") > /dev/null 2>&1 +CHANGED=$(git diff --name-only "$1") if [ -n "$CHANGED" ]; then echo "script requires update"