From d938f7320786955f3498cf4db18d210c0f1e56c0 Mon Sep 17 00:00:00 2001 From: Promofaux Date: Fri, 26 Aug 2016 23:10:22 +0100 Subject: [PATCH] Fix line endings --- pihole | 132 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 131 insertions(+), 1 deletion(-) diff --git a/pihole b/pihole index c8ceb8ca..3863db74 100755 --- a/pihole +++ b/pihole @@ -1 +1,131 @@ -#!/bin/bash # Pi-hole: A black hole for Internet advertisements # (c) 2015, 2016 by Jacob Salmela # Network-wide ad blocking via your Raspberry Pi # http://pi-hole.net # Controller for all pihole scripts and functions. # # Pi-hole is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 2 of the License, or # (at your option) any later version. # Must be root to use this tool if [[ ! $EUID -eq 0 ]];then #echo "::: You are root." #else #echo "::: Sudo will be used for this tool." # Check if it is actually installed # If it isn't, exit because the pihole cannot be invoked without privileges. if [ -x "$(command -v sudo)" ];then export SUDO="sudo" else echo "::: Please install sudo or run this as root." exit 1 fi fi function whitelistFunc { shift ${SUDO} /opt/pihole/whitelist.sh "$@" exit 1 } function blacklistFunc { shift ${SUDO} /opt/pihole/blacklist.sh "$@" exit 1 } function debugFunc { ${SUDO} /opt/pihole/piholeDebug.sh exit 1 } function flushFunc { ${SUDO} /opt/pihole/piholeLogFlush.sh exit 1 } function updateDashboardFunc { ${SUDO} /opt/pihole/updateDashboard.sh exit 1 } function updatePiholeFunc { echo "::: Fetching latest changes from Github..." cd /etc/.pihole ${SUDO} git pull ${SUDO} /etc/.pihole/automated\ install/basic-install.sh pihole exit 1 } function updateGravityFunc { ${SUDO} /opt/pihole/gravity.sh "$@" exit 1 } function setupLCDFunction { ${SUDO} /opt/pihole/setupLCD.sh exit 1 } function chronometerFunc { shift ${SUDO} /opt/pihole/chronometer.sh "$@" exit 1 } function uninstallFunc { ${SUDO} /opt/pihole/uninstall.sh exit 1 } function versionFunc { ${SUDO} /opt/pihole/version.sh exit 1 } function helpFunc { echo "::: Control all PiHole specific functions!" echo ":::" echo "::: Usage: pihole [options]" echo "::: Add -h after -w (whitelist), -b (blacklist), or -c (chronometer) for more information on usage" echo ":::" echo "::: Options:" echo "::: -w, whitelist Whitelist domains" echo "::: -b, blacklist Blacklist domains" echo "::: -d, debug Start a debugging session if having trouble" echo "::: -f, flush Flush the pihole.log file" echo "::: -ud, updateDashboard Update the web dashboard manually" echo "::: -up, updatePihole Update Pi-hole" echo "::: -g, updateGravity Update the list of ad-serving domains" echo "::: -s, setupLCD Automatically configures the Pi to use the 2.8 LCD screen to display stats on it" echo "::: -c, chronometer Calculates stats and displays to an LCD" echo "::: -h, help Show this help dialog" echo "::: -v, version Show current versions" echo "::: uninstall Uninstall Pi-Hole from your system :(!" exit 1 } if [[ $# = 0 ]]; then helpFunc fi # Handle redirecting to specific functions based on arguments case "$1" in "-w" | "whitelist" ) whitelistFunc "$@";; "-b" | "blacklist" ) blacklistFunc "$@";; "-d" | "debug" ) debugFunc;; "-f" | "flush" ) flushFunc;; "-ud" | "updateDashboard" ) updateDashboardFunc;; "-up" | "updatePihole" ) updatePiholeFunc;; "-g" | "updateGravity" ) updateGravityFunc "$@";; "-s" | "setupLCD" ) setupLCDFunction;; "-c" | "chronometer" ) chronometerFunc "$@";; "-h" | "help" ) helpFunc;; "-v" | "version" ) versionFunc;; "uninstall" ) uninstallFunc;; * ) helpFunc;; esac \ No newline at end of file +#!/bin/bash +# Pi-hole: A black hole for Internet advertisements +# (c) 2015, 2016 by Jacob Salmela +# Network-wide ad blocking via your Raspberry Pi +# http://pi-hole.net +# Controller for all pihole scripts and functions. +# +# Pi-hole is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. + +# Must be root to use this tool +if [[ ! $EUID -eq 0 ]];then + #echo "::: You are root." +#else + #echo "::: Sudo will be used for this tool." + # Check if it is actually installed + # If it isn't, exit because the pihole cannot be invoked without privileges. + if [ -x "$(command -v sudo)" ];then + export SUDO="sudo" + else + echo "::: Please install sudo or run this as root." + exit 1 + fi +fi + +function whitelistFunc { + shift + ${SUDO} /opt/pihole/whitelist.sh "$@" + exit 1 +} + +function blacklistFunc { + shift + ${SUDO} /opt/pihole/blacklist.sh "$@" + exit 1 +} + +function debugFunc { + ${SUDO} /opt/pihole/piholeDebug.sh + exit 1 +} + +function flushFunc { + ${SUDO} /opt/pihole/piholeLogFlush.sh + exit 1 +} + +function updateDashboardFunc { + ${SUDO} /opt/pihole/updateDashboard.sh + exit 1 +} + +function updatePiholeFunc { + echo "::: Fetching latest changes from Github..." + cd /etc/.pihole + ${SUDO} git pull + ${SUDO} /etc/.pihole/automated\ install/basic-install.sh pihole + exit 1 +} + +function updateGravityFunc { + ${SUDO} /opt/pihole/gravity.sh "$@" + exit 1 +} + +function setupLCDFunction { + ${SUDO} /opt/pihole/setupLCD.sh + exit 1 +} + +function chronometerFunc { + shift + ${SUDO} /opt/pihole/chronometer.sh "$@" + exit 1 +} + + +function uninstallFunc { + ${SUDO} /opt/pihole/uninstall.sh + exit 1 +} + +function versionFunc { + ${SUDO} /opt/pihole/version.sh + exit 1 +} + +function helpFunc { + echo "::: Control all PiHole specific functions!" + echo ":::" + echo "::: Usage: pihole [options]" + echo "::: Add -h after -w (whitelist), -b (blacklist), or -c (chronometer) for more information on usage" + echo ":::" + echo "::: Options:" + echo "::: -w, whitelist Whitelist domains" + echo "::: -b, blacklist Blacklist domains" + echo "::: -d, debug Start a debugging session if having trouble" + echo "::: -f, flush Flush the pihole.log file" + echo "::: -ud, updateDashboard Update the web dashboard manually" + echo "::: -up, updatePihole Update Pi-hole" + echo "::: -g, updateGravity Update the list of ad-serving domains" + echo "::: -s, setupLCD Automatically configures the Pi to use the 2.8 LCD screen to display stats on it" + echo "::: -c, chronometer Calculates stats and displays to an LCD" + echo "::: -h, help Show this help dialog" + echo "::: -v, version Show current versions" + echo "::: uninstall Uninstall Pi-Hole from your system :(!" + exit 1 +} + +if [[ $# = 0 ]]; then + helpFunc +fi + +# Handle redirecting to specific functions based on arguments +case "$1" in +"-w" | "whitelist" ) whitelistFunc "$@";; +"-b" | "blacklist" ) blacklistFunc "$@";; +"-d" | "debug" ) debugFunc;; +"-f" | "flush" ) flushFunc;; +"-ud" | "updateDashboard" ) updateDashboardFunc;; +"-up" | "updatePihole" ) updatePiholeFunc;; +"-g" | "updateGravity" ) updateGravityFunc "$@";; +"-s" | "setupLCD" ) setupLCDFunction;; +"-c" | "chronometer" ) chronometerFunc "$@";; +"-h" | "help" ) helpFunc;; +"-v" | "version" ) versionFunc;; +"uninstall" ) uninstallFunc;; +* ) helpFunc;; +esac