diff --git a/get_blocklists.sh b/get_blocklists.sh index 1e39c76..b80aa3e 100755 --- a/get_blocklists.sh +++ b/get_blocklists.sh @@ -45,11 +45,11 @@ if ping -c 1 -W 2 www.google.fi &> /dev/null ; then fetch_blocklist 'https://raw.githubusercontent.com/Spam404/lists/master/main-blacklist.txt' "Spam404.txt" # DC old lists - fetch_blocklist 'https://gitlab.com/ZeroDot1/CoinBlockerLists/-/raw/master/list.txt' "coinblocker.list.txt" + # fetch_blocklist 'https://gitlab.com/ZeroDot1/CoinBlockerLists/-/raw/master/list.txt' "coinblocker.list.txt" fetch_blocklist 'https://gitlab.com/ZeroDot1/CoinBlockerLists/-/raw/master/list_browser.txt' "coinblocker.browser.txt" - fetch_blocklist 'https://energized.pro/porn/formats/domains.txt' "profanity.txt" + # fetch_blocklist 'https://energized.pro/porn/formats/domains.txt' "profanity.txt" # fetch_blocklist 'https://blocklistproject.github.io/Lists/alt-version/porn-nl.txt' "profanity_ultra.txt" # Has 2 million domains - fetch_blocklist 'https://theantisocialengineer.com/AntiSocial_Blacklist_Community_V1.txt' "AntiSocial_Blacklist_Community_V1.txt" + # fetch_blocklist 'https://theantisocialengineer.com/AntiSocial_Blacklist_Community_V1.txt' "AntiSocial_Blacklist_Community_V1.txt" # Steven Black's list needs some extra clean up curl -sSL 'https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts' >| 'tmp.txt' diff --git a/pull.lists.sh b/pull.lists.sh index 698bcc7..ccd81c5 100755 --- a/pull.lists.sh +++ b/pull.lists.sh @@ -2,7 +2,7 @@ #--- Set parameters based on Distribution if [ "$(uname)" == "Darwin" ]; then - cd '/Users/deepankar/OneDrive - O365 Turun yliopisto/Git/Gitlab.DC/pihole_lists' || echo "can't find ~/Git/Gitlab.DC/pihole_lists" + cd '/Users/deepankar/Library/CloudStorage/GoogleDrive-robocopalpha404@gmail.com/My Drive/Git/Gitlab.DC/pihole_lists' || echo "can't find ~/Git/Gitlab.DC/pihole_lists" elif [ "$(uname)" == "Linux" ]; then cd '/home/dietpi/pihole_lists' || echo "/home/dietpi not found." else diff --git a/readme.md b/readme.md index 1327894..1c0ab0f 100755 --- a/readme.md +++ b/readme.md @@ -38,11 +38,11 @@ git add -u ; git commit -m "Update `date +'%Y-%m-%d'`" ; git push Then updating your pihole instances is as simple as running the included `update.pi.sh` script on your pihole from your git repo: ```sh -curl -L "https://gitlab.com/robocopAlpha/pihole_lists/-/raw/master/update.pi.sh" | bash +curl -L "https://gitlab.com/robocopAlpha/pihole_lists/-/raw/main/update.pi.sh" | bash # To make it even easier # just add this to your ~/.bashrc or ~/.zshrc -alias update.pi='curl -L "https://gitlab.com/robocopAlpha/pihole_lists/-/raw/master/update.pi.sh" | bash' +alias update.pi='curl -L "https://gitlab.com/robocopAlpha/pihole_lists/-/raw/main/update.pi.sh" | bash' # Command to easily add the alias is included in the update.pi.sh ``` diff --git a/set_env.sh b/set_env.sh index 0d2ddea..f3cfe58 100644 --- a/set_env.sh +++ b/set_env.sh @@ -33,7 +33,7 @@ if [ "$(uname)" == "Darwin" ]; then # # usage: getMD5 'filename' > outfile # echo "$(md5 -q ${1})" # } - HOME_DIR=/Users/deepankar/OneDrive\ -\ O365\ Turun\ yliopisto/Git/Gitlab.DC + HOME_DIR='/Users/deepankar/Library/CloudStorage/GoogleDrive-robocopalpha404@gmail.com/My Drive/Git/Gitlab.DC' RCloneConfig=/Users/deepankar/.config/rclone/rclone.conf elif [ "$(uname)" == "Linux" ]; then # echo "Setting params for Linux..." diff --git a/update.pi.sh b/update.pi.sh index 6092280..aeaa539 100755 --- a/update.pi.sh +++ b/update.pi.sh @@ -1,13 +1,13 @@ #!/usr/bin/env bash # ------- How to use ------: -# curl -L 'https://gitlab.com/robocopAlpha/pihole_lists/-/raw/master/update.pi.sh' | bash +# curl -L 'https://gitlab.com/robocopAlpha/pihole_lists/-/raw/main/update.pi.sh' | bash # --------- Make alias ---- : -# echo "alias update.pi='curl -L "https://gitlab.com/robocopAlpha/pihole_lists/-/raw/master/update.pi.sh" | bash'" >> .bashrc +# echo "alias update.pi='curl -L "https://gitlab.com/robocopAlpha/pihole_lists/-/raw/main/update.pi.sh" | bash'" >> .bashrc -# echo "alias update.pi='curl -L "https://gitlab.com/robocopAlpha/pihole_lists/-/raw/master/update.pi.sh" | bash'" >> .zshrc +# echo "alias update.pi='curl -L "https://gitlab.com/robocopAlpha/pihole_lists/-/raw/main/update.pi.sh" | bash'" >> .zshrc # ----- Begin Script ------