From 59e421270225581a9b89de90390bb6442df3c731 Mon Sep 17 00:00:00 2001 From: andryyy Date: Mon, 10 Jun 2019 22:44:10 +0200 Subject: [PATCH] [Update] Check if file is tracked before running git rm --- update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update.sh b/update.sh index a931c331..913da049 100755 --- a/update.sh +++ b/update.sh @@ -316,7 +316,7 @@ git remote set-url origin https://github.com/mailcow/mailcow-dockerized echo -e "\e[32mCommitting current status...\e[0m" [[ -z "$(git config user.name)" ]] && git config user.name moo [[ -z "$(git config user.email)" ]] && git config user.email moo@cow.moo -git rm data/conf/rspamd/override.d/worker-controller-password.inc 2> /dev/null +[[ ! -z $(git ls-files data/conf/rspamd/override.d/worker-controller-password.inc) ]] && git rm data/conf/rspamd/override.d/worker-controller-password.inc git add -u git commit -am "Before update on ${DATE}" > /dev/null echo -e "\e[32mFetching updated code from remote...\e[0m"