diff --git a/pihole-sync b/pihole-sync index 9b8b674..a041e1c 100755 --- a/pihole-sync +++ b/pihole-sync @@ -102,11 +102,11 @@ pull_initialize () { git reset --hard origin/main -q # Stop DNS server - # $SUDO service pihole-FTL stop + $SUDO service pihole-FTL stop # Overwrite local files - # cp $custom_list $pihole_dir - # cp $cname_list $dnsmasq_dir + cp $custom_list $pihole_dir + cp $cname_list $dnsmasq_dir if [ $(/sbin/ip -o -4 addr list br0 | awk '{print $4}' | cut -d/ -f1) != "10.5.1.1" ] && [ $(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) != "10.10.10.10" ]; then # cp $localdomains_list $dnsmasq_dir echo "copying" @@ -114,14 +114,15 @@ pull_initialize () { echo "not copying" fi + # Overwrite local database tables - # sqlite3 $gravity_db "DROP TABLE adlist;" - # sqlite3 $gravity_db -header -csv ".import adlist.csv adlist" - # sqlite3 $gravity_db "DROP TABLE domainlist;" - # sqlite3 $gravity_db -header -csv ".import domainlist.csv domainlist" + sqlite3 $gravity_db "DROP TABLE adlist;" + sqlite3 $gravity_db -header -csv ".import adlist.csv adlist" + sqlite3 $gravity_db "DROP TABLE domainlist;" + sqlite3 $gravity_db -header -csv ".import domainlist.csv domainlist" # Restart Pi-hole to pick up changes - # $SUDO pihole -g + $SUDO pihole -g # Display success messages echo "Local Pi-hole initialized in Pull mode and first pull successfully completed."; @@ -169,28 +170,31 @@ pull () { # Update local Git repo from remote Git repo git remote update > /dev/null CHANGED=$(git log HEAD..origin/main --oneline) - if [ -n "${CHANGED}" ]; then + # 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 - git fetch --all -q - git reset --hard origin/main -q - $SUDO service pihole-FTL stop - cp $custom_list $pihole_dir - cp $cname_list $dnsmasq_dir - # if [ ! -f "/opt/pihole-docker" ]; then - cp $localdomains_list $dnsmasq_dir - # fi - sqlite3 $gravity_db "DROP TABLE adlist;" - sqlite3 $gravity_db -header -csv ".import adlist.csv adlist" - sqlite3 $gravity_db "DROP TABLE domainlist;" - sqlite3 $gravity_db -header -csv ".import domainlist.csv domainlist" - $SUDO pihole -g + # git fetch --all -q + # git reset --hard origin/main -q + # $SUDO service pihole-FTL stop + # cp $custom_list $pihole_dir + # cp $cname_list $dnsmasq_dir + if [ $(/sbin/ip -o -4 addr list br0 | awk '{print $4}' | cut -d/ -f1) != "10.5.1.1" ] && [ $(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) != "10.10.10.10" ]; then + # cp $localdomains_list $dnsmasq_dir + echo "copying" + else + echo "not copying" + fi + # sqlite3 $gravity_db "DROP TABLE adlist;" + # sqlite3 $gravity_db -header -csv ".import adlist.csv adlist" + # sqlite3 $gravity_db "DROP TABLE domainlist;" + # sqlite3 $gravity_db -header -csv ".import domainlist.csv domainlist" + # $SUDO pihole -g echo 'Done!'; exit 0 - else - echo 'Local Pi-hole lists match remote Git repo. No further action required.'; - exit 0 - fi + # else + # echo 'Local Pi-hole lists match remote Git repo. No further action required.'; + # exit 0 + # fi } @@ -226,7 +230,7 @@ do elif [ "$arg" == "--pull" ] || [ "$arg" == "--download" ] || [ "$arg" == "--down" ]|| [ "$arg" == "-d" ] then echo "$arg option detected. Running in Pull/Download mode." - # pull + pull exit 0 # Help - Displays help dialog elif [ "$arg" == "--help" ] || [ "$arg" == "-h" ] || [ "$arg" == "-?" ]