andros/maza-ad-blocking
1
0
Fork 0
mirror of https://github.com/tanrax/maza-ad-blocking.git synced 2024-09-20 00:17:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19 from ebb-earl-co/shellcheck

Browse Source 
Update Maza Script to Appease Shellcheck Linter
This commit is contained in:
Andros Fenollosa 2023-02-22 19:15:02 +01:00 committed by GitHub
commit a9640d5c15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
maza
View File

@ -7,12 +7,12 @@ set -e
URL_DNS_LIST="https://pgl.yoyo.org/adservers/serverlist.php?showintro=0&mimetype=plaintext" URL_DNS_LIST="https://pgl.yoyo.org/adservers/serverlist.php?showintro=0&mimetype=plaintext"
NAME_OSX="Darwin" NAME_OSX="Darwin"
THIS_OS=$(uname -mrs) THIS_OS=$(uname -mrs)
PROGNAME=$(basename $0) PROGNAME=$(basename "$0")
[[ -z "${XDG_CONFIG_HOME}" ]] && CONFIG=$HOME/.maza/ || CONFIG=$XDG_CONFIG_HOME/maza [[ -z "${XDG_CONFIG_HOME}" ]] && CONFIG=$HOME/.maza/ || CONFIG=$XDG_CONFIG_HOME/maza
HOST_FILE=(/etc/hosts) HOST_FILE=/etc/hosts
COLOR_RED=`tput setaf 1` COLOR_RED=$(tput setaf 1)
COLOR_GREEN=`tput setaf 2` COLOR_GREEN=$(tput setaf 2)
COLOR_RESET=`tput sgr0` COLOR_RESET=$(tput sgr0)
LIST="list" LIST="list"
LIST_DNSMASQ="dnsmasq.conf" LIST_DNSMASQ="dnsmasq.conf"
START_TAG="## MAZA - List ad blocking" START_TAG="## MAZA - List ad blocking"
@ -72,9 +72,9 @@ status() {
update() { update() {
# Make conf folder # Make conf folder
rm -f $CONFIG$LIST rm -f "$CONFIG$LIST"
rm -f $CONFIG$LIST_DNSMASQ rm -f "$CONFIG$LIST_DNSMASQ"
mkdir -p $CONFIG mkdir -p "$CONFIG"
# Download DNS list # Download DNS list
curl -L -s "$URL_DNS_LIST" -o "$CONFIG$LIST" curl -L -s "$URL_DNS_LIST" -o "$CONFIG$LIST"
# Clear list # Clear list
@ -90,13 +90,13 @@ update() {
custom-sed -i.bak "1i\\$PROJECT" "$CONFIG$LIST" custom-sed -i.bak "1i\\$PROJECT" "$CONFIG$LIST"
custom-sed -i.bak "1i\\$START_TAG" "$CONFIG$LIST" custom-sed -i.bak "1i\\$START_TAG" "$CONFIG$LIST"
## Add end tag DNS list in first line ## Add end tag DNS list in first line
echo $END_TAG >> "$CONFIG/$LIST" echo "$END_TAG" >> "$CONFIG/$LIST"
## Add start tag DNS dnsmasq in first line ## Add start tag DNS dnsmasq in first line
custom-sed -i.bak "1i\\$AUTHOR" "$CONFIG$LIST_DNSMASQ" custom-sed -i.bak "1i\\$AUTHOR" "$CONFIG$LIST_DNSMASQ"
custom-sed -i.bak "1i\\$PROJECT" "$CONFIG$LIST_DNSMASQ" custom-sed -i.bak "1i\\$PROJECT" "$CONFIG$LIST_DNSMASQ"
custom-sed -i.bak "1i\\$START_TAG" "$CONFIG$LIST_DNSMASQ" custom-sed -i.bak "1i\\$START_TAG" "$CONFIG$LIST_DNSMASQ"
## Add end tag DNS DNSMASQ in first line ## Add end tag DNS DNSMASQ in first line
echo $END_TAG >> "$CONFIG$LIST_DNSMASQ" echo "$END_TAG" >> "$CONFIG$LIST_DNSMASQ"
# Remove temp file # Remove temp file
rm "$CONFIG$LIST.bak" rm "$CONFIG$LIST.bak"
rm "$CONFIG$LIST_DNSMASQ.bak" rm "$CONFIG$LIST_DNSMASQ.bak"
@ -117,7 +117,7 @@ stop() {
custom-sed -i "/$START_TAG/,/$END_TAG/d" "$HOST_FILE" custom-sed -i "/$START_TAG/,/$END_TAG/d" "$HOST_FILE"
# Remove DNSMASQ # Remove DNSMASQ
cat /dev/null > $CONFIG$LIST_DNSMASQ cat /dev/null > "$CONFIG$LIST_DNSMASQ"
# Notify user # Notify user
echo "${COLOR_GREEN}DISABLED!${COLOR_RESET}" echo "${COLOR_GREEN}DISABLED!${COLOR_RESET}"