7x31/mailcow-dockerized
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Update] Checkout pcre header check if missing, fixes #1906

Browse Source
This commit is contained in:
André
2018-10-16 21:40:25 +02:00
parent 51dd88abeb
commit 40888a713a
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
update.sh
View File

@@ -254,8 +254,9 @@ sleep 2
docker-compose down docker-compose down
# Fix header check # Fix header check
[[ -f data/conf/postfix/mailcow_anonymize_headers.pcre ]] && \ if [[ -f data/conf/postfix/mailcow_anonymize_headers.pcre ]]; then
mv data/conf/postfix/mailcow_anonymize_headers.pcre data/conf/postfix/mailcow_anonymize_headers.pcre_ mv data/conf/postfix/mailcow_anonymize_headers.pcre data/conf/postfix/mailcow_anonymize_headers.pcre_
fi
# Silently fixing remote url from andryyy to mailcow # Silently fixing remote url from andryyy to mailcow
git remote set-url origin https://github.com/mailcow/mailcow-dockerized git remote set-url origin https://github.com/mailcow/mailcow-dockerized
echo -e "\e[32mCommitting current status...\e[0m" echo -e "\e[32mCommitting current status...\e[0m"
@@ -285,7 +286,10 @@ elif [[ ${MERGE_RETURN} != 0 ]]; then
echo "Run docker-compose up -d to restart your stack without updates or try again after fixing the mentioned errors." echo "Run docker-compose up -d to restart your stack without updates or try again after fixing the mentioned errors."
exit 1 exit 1
fi fi
# Make sure missing files do exist, checkout missing files if any
if [[ ! -f data/conf/postfix/mailcow_anonymize_headers.pcre ]]; then
git checkout origin/${BRANCH} data/conf/postfix/mailcow_anonymize_headers.pcre
fi
echo -e "\e[32mFetching new docker-compose version...\e[0m" echo -e "\e[32mFetching new docker-compose version...\e[0m"
sleep 2 sleep 2