Release 1.10

This commit is contained in:
Steve Jenkins 2019-07-10 14:35:34 -07:00
parent 7dc3e1d502
commit a7dcb2a399

View File

@ -4,7 +4,7 @@
# pihole-cloudsync
# Helper script to keep multiple Pi-holes' lists synchronized via Git
# Version 1.9 - July 10, 2019 - Steve Jenkins (stevejenkins.com)
# Version 1.10 - July 10, 2019 - Steve Jenkins (stevejenkins.com)
# SETUP
# Follow the instructions in the README to set up your own private Git
@ -55,8 +55,8 @@ push () {
cd $pihole_dir || exit
$SUDO cp $ad_list $black_list $blacklist_list $whitelist_list $regex_list $personal_git_dir
cd $personal_git_dir || exit
$SUDO git remote update
CHANGED=$($SUDO git --work-tree=$personal_git_dir status --porcelain)
$SUDO git remote update > /dev/null
CHANGED=$($SUDO git --work-tree=$personal_git_dir status --branch --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")
@ -72,8 +72,8 @@ push () {
}
pull () {
cd $personal_git_dir || exit
$SUDO git remote update
CHANGED=$($SUDO git --work-tree=$personal_git_dir status --porcelain)
$SUDO git remote update > /dev/null
CHANGED=$($SUDO git --work-tree=$personal_git_dir status --branch --porcelain)
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