From c5410e18017354a3c3f5e9f8a29121d7e417e61f Mon Sep 17 00:00:00 2001 From: Steve Jenkins Date: Wed, 10 Jul 2019 14:55:04 -0700 Subject: [PATCH] Release 1.11 --- pihole-cloudsync | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pihole-cloudsync b/pihole-cloudsync index 0ad7964..017695f 100755 --- a/pihole-cloudsync +++ b/pihole-cloudsync @@ -4,7 +4,7 @@ # pihole-cloudsync # Helper script to keep multiple Pi-holes' lists synchronized via Git -# Version 1.10 - July 10, 2019 - Steve Jenkins (stevejenkins.com) +# Version 1.11 - July 10, 2019 - Steve Jenkins (stevejenkins.com) # SETUP # Follow the instructions in the README to set up your own private Git @@ -56,7 +56,7 @@ push () { $SUDO cp $ad_list $black_list $blacklist_list $whitelist_list $regex_list $personal_git_dir cd $personal_git_dir || exit $SUDO git remote update > /dev/null - CHANGED=$($SUDO git --work-tree=$personal_git_dir status --branch --porcelain) + CHANGED=$($SUDO git --work-tree=$personal_git_dir status --porcelain) if [ -n "${CHANGED}" ]; then echo 'Local Pi-hole lists are different than remote Git repo. Updating remote repo...'; rightnow=$(date +"%B %e, %Y %l:%M%p") @@ -73,7 +73,7 @@ push () { pull () { cd $personal_git_dir || exit $SUDO git remote update > /dev/null - CHANGED=$($SUDO git --work-tree=$personal_git_dir status --branch --porcelain) + CHANGED=$($SUDO git log HEAD..origin/master --oneline) if [ -n "${CHANGED}" ]; then echo 'Remote Git repo is different than local Pi-hole lists. Updating local lists...'; # Remove -q option if you don't want to run in "quiet" mode