Mirrored_Repos/pihole-cloudsync
1
0
Fork 0
mirror of https://github.com/stevejenkins/pihole-cloudsync.git synced 2024-08-30 18:22:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Release 1.9

Browse Source
This commit is contained in:
Steve Jenkins 2019-07-10 14:19:07 -07:00
parent 500c8a887a
commit 6be307442b
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pihole-cloudsync
View File

@ -4,7 +4,7 @@
# pihole-cloudsync # pihole-cloudsync
# Helper script to keep multiple Pi-holes' lists synchronized via Git # Helper script to keep multiple Pi-holes' lists synchronized via Git
# Version 1.8 - July 10, 2019 - Steve Jenkins (stevejenkins.com) # Version 1.9 - July 10, 2019 - Steve Jenkins (stevejenkins.com)
# SETUP # SETUP
# Follow the instructions in the README to set up your own private Git # Follow the instructions in the README to set up your own private Git
@ -55,7 +55,8 @@ push () {
cd $pihole_dir || exit cd $pihole_dir || exit
$SUDO cp $ad_list $black_list $blacklist_list $whitelist_list $regex_list $personal_git_dir $SUDO cp $ad_list $black_list $blacklist_list $whitelist_list $regex_list $personal_git_dir
cd $personal_git_dir || exit cd $personal_git_dir || exit
CHANGED=$($SUDO git remote update && git --work-tree=$personal_git_dir status --porcelain) $SUDO git remote update
CHANGED=$($SUDO git --work-tree=$personal_git_dir status --porcelain)
if [ -n "${CHANGED}" ]; then if [ -n "${CHANGED}" ]; then
echo 'Local Pi-hole lists are different than remote Git repo. Updating remote repo...'; echo 'Local Pi-hole lists are different than remote Git repo. Updating remote repo...';
rightnow=$(date +"%B %e, %Y %l:%M%p") rightnow=$(date +"%B %e, %Y %l:%M%p")
@ -71,7 +72,8 @@ push () {
} }
pull () { pull () {
cd $personal_git_dir || exit cd $personal_git_dir || exit
CHANGED=$($SUDO git remote update && git --work-tree=$personal_git_dir status --porcelain) $SUDO git remote update
CHANGED=$($SUDO git --work-tree=$personal_git_dir status --porcelain)
if [ -n "${CHANGED}" ]; then if [ -n "${CHANGED}" ]; then
echo 'Remote Git repo is different than local Pi-hole lists. Updating local lists...'; 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 # Remove -q option if you don't want to run in "quiet" mode