arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2024-12-22 14:58:08 +00:00
Code Issues Releases Wiki Activity

Consistency

Browse Source 
We went with tabs earlier, may as well make that the "standard".
Easy enough to switch to spaces too if that's desired with expand(1)
This commit is contained in:
Marcus Hildum 2016-10-21 23:17:14 -07:00
parent ebbe1fc236
commit 640398ced4
1 changed files with 60 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

121
pihole
View File

@ -12,88 +12,87 @@
# Must be root to use this tool # Must be root to use this tool
if [[ ! $EUID -eq 0 ]];then if [[ ! $EUID -eq 0 ]];then
if [ -x "$(command -v sudo)" ];then if [ -x "$(command -v sudo)" ];then
exec sudo bash "$0" "$@" exec sudo bash "$0" "$@"
exit $? exit $?
else else
echo "::: sudo is needed to run pihole commands. Please run this script as root or install sudo." echo "::: sudo is needed to run pihole commands. Please run this script as root or install sudo."
exit 1 exit 1
fi fi
fi fi
whitelistFunc() { whitelistFunc() {
shift shift
/opt/pihole/whitelist.sh "$@" /opt/pihole/whitelist.sh "$@"
exit 0 exit 0
} }
blacklistFunc() { blacklistFunc() {
shift shift
/opt/pihole/blacklist.sh "$@" /opt/pihole/blacklist.sh "$@"
exit 0 exit 0
} }
debugFunc() { debugFunc() {
/opt/pihole/piholeDebug.sh /opt/pihole/piholeDebug.sh
exit 0 exit 0
} }
flushFunc() { flushFunc() {
/opt/pihole/piholeLogFlush.sh /opt/pihole/piholeLogFlush.sh
exit 0 exit 0
} }
updatePiholeFunc() { updatePiholeFunc() {
/opt/pihole/update.sh /opt/pihole/update.sh
exit 0 exit 0
} }
reconfigurePiholeFunc() { reconfigurePiholeFunc() {
/etc/.pihole/automated\ install/basic-install.sh --reconfigure /etc/.pihole/automated\ install/basic-install.sh --reconfigure
exit 0; exit 0;
} }
updateGravityFunc() { updateGravityFunc() {
/opt/pihole/gravity.sh "$@" /opt/pihole/gravity.sh "$@"
exit 0 exit 0
} }
setupLCDFunction() { setupLCDFunction() {
/opt/pihole/setupLCD.sh /opt/pihole/setupLCD.sh
exit 0 exit 0
} }
queryFunc() { queryFunc() {
domain=$2 domain=$2
for list in /etc/pihole/list.* for list in /etc/pihole/list.*; do
do count=$(grep ${domain} $list | wc -l)
count=$(grep ${domain} $list | wc -l) echo "::: ${list} (${count} results)"
echo "::: ${list} (${count} results)" if [[ ${count} > 0 ]]; then
if [[ ${count} > 0 ]]; then grep ${domain} ${list}
grep ${domain} ${list} fi
fi echo ""
echo "" done
done exit 0
exit 0
} }
chronometerFunc() { chronometerFunc() {
shift shift
/opt/pihole/chronometer.sh "$@" /opt/pihole/chronometer.sh "$@"
exit 0 exit 0
} }
uninstallFunc() { uninstallFunc() {
/opt/pihole/uninstall.sh /opt/pihole/uninstall.sh
exit 0 exit 0
} }
versionFunc() { versionFunc() {
shift shift
/opt/pihole/version.sh "$@" /opt/pihole/version.sh "$@"
exit 0 exit 0
} }
helpFunc() { helpFunc() {
@ -117,27 +116,27 @@ helpFunc() {
::: -q, query Query the adlists for a specific domain ::: -q, query Query the adlists for a specific domain
::: uninstall Uninstall Pi-Hole from your system :(! ::: uninstall Uninstall Pi-Hole from your system :(!
EOM EOM
exit 1 exit 1
} }
if [[ $# = 0 ]]; then if [[ $# = 0 ]]; then
helpFunc helpFunc
fi fi
# Handle redirecting to specific functions based on arguments # Handle redirecting to specific functions based on arguments
case "$1" in case "${1}" in
"-w" | "whitelist" ) whitelistFunc "$@";; "-w" | "whitelist" ) whitelistFunc "$@";;
"-b" | "blacklist" ) blacklistFunc "$@";; "-b" | "blacklist" ) blacklistFunc "$@";;
"-d" | "debug" ) debugFunc;; "-d" | "debug" ) debugFunc;;
"-f" | "flush" ) flushFunc;; "-f" | "flush" ) flushFunc;;
"-up" | "updatePihole" ) updatePiholeFunc;; "-up" | "updatePihole" ) updatePiholeFunc;;
"-r" | "reconfigure" ) reconfigurePiholeFunc;; "-r" | "reconfigure" ) reconfigurePiholeFunc;;
"-g" | "updateGravity" ) updateGravityFunc "$@";; "-g" | "updateGravity" ) updateGravityFunc "$@";;
"-s" | "setupLCD" ) setupLCDFunction;; "-s" | "setupLCD" ) setupLCDFunction;;
"-c" | "chronometer" ) chronometerFunc "$@";; "-c" | "chronometer" ) chronometerFunc "$@";;
"-h" | "help" ) helpFunc;; "-h" | "help" ) helpFunc;;
"-v" | "version" ) versionFunc "$@";; "-v" | "version" ) versionFunc "$@";;
"-q" | "query" ) queryFunc "$@";; "-q" | "query" ) queryFunc "$@";;
"uninstall" ) uninstallFunc;; "uninstall" ) uninstallFunc;;
* ) helpFunc;; * ) helpFunc;;
esac esac