diff --git a/.DS_Store b/.DS_Store index 5008ddf..80dc2df 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d4c0277 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ + +.DS_Store +.DS_Store +.DS_Store diff --git a/pihole-sync b/pihole-sync index 872c5ce..9095f96 100755 --- a/pihole-sync +++ b/pihole-sync @@ -32,7 +32,12 @@ update='December 26, 2020' # Project Home: https://github.com/stevejenkins/pihole-cloudsync ########################################################################### # CONSTANTS -personal_git_dir='/usr/local/bin/my-pihole-sync' +if [ -f "/opt/pihole-docker" ]; then + personal_git_dir='/opt/my-pihole-sync' +else + personal_git_dir='/usr/local/bin/my-pihole-sync' +fi + # if [ -d "/opt/docker-pi-hole/etc-pihole" ]; then # pihole_dir='/opt/docker-pi-hole/etc-pihole' @@ -71,7 +76,6 @@ push_initialize () { # Copy local Custom and CNAME lists to local Git repo cp $custom_list $personal_git_dir cp $dnsmasq_dir/$cname_list $personal_git_dir - cp $dnsmasq_dir/$localdomains_list $personal_git_dir # Go to local Git repo directory cd $personal_git_dir || exit @@ -101,7 +105,9 @@ pull_initialize () { # Overwrite local files cp $custom_list $pihole_dir cp $cname_list $dnsmasq_dir - cp $localdomains_list $dnsmasq_dir + if [ ! -f "/opt/pihole-docker" ]; then + cp $localdomains_list $dnsmasq_dir + fi # Overwrite local database tables sqlite3 $gravity_db "DROP TABLE adlist;" @@ -166,7 +172,9 @@ pull () { $SUDO service pihole-FTL stop cp $custom_list $pihole_dir cp $cname_list $dnsmasq_dir - cp $localdomains_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;" @@ -179,6 +187,7 @@ pull () { exit 0 fi } + ########################################################################### # Check to see whether a command line option was provided if [ -z "$1" ]