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

Standardize function declaration

Browse Source 
There were no fewer than three styles of function declaration going
on in these files, so I attempted to standardize them to the typical

myfucn() {
}

style.
This commit is contained in:
Marcus Hildum 2016-10-19 19:47:45 -07:00
parent 16e4f79f09
commit 28eeaf201b
9 changed files with 55 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
advanced/Scripts/blacklist.sh
View File

@ -10,8 +10,7 @@
# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
helpFunc()
{
helpFunc() {
echo "::: Immediately blacklists one or more domains in the hosts file"
echo ":::"
echo ":::"

24
advanced/Scripts/piholeDebug.sh
View File

@ -1,4 +1,4 @@
#!/usr/bin/env bash
#/usr/bin/env bash
# Pi-hole: A black hole for Internet advertisements
# (c) 2015, 2016 by Jacob Salmela
# Network-wide ad blocking via your Raspberry Pi
@ -61,11 +61,11 @@ else
fi
### Private functions exist here ###
function log_write {
log_write() {
echo "$1" >> "${DEBUG_LOG}"
}
function version_check {
version_check() {
log_write "############################################################"
log_write "########## Installed Versions ##########"
log_write "############################################################"
@ -83,7 +83,7 @@ function version_check {
php_ver="$(php -v |& head -n1)" && log_write "${php_ver}" || log_write "PHP not installed."
}
function distro_check {
distro_check() {
echo "############################################################" >> ${DEBUG_LOG}
echo "######## Installed OS Distribution #########" >> ${DEBUG_LOG}
echo "############################################################" >> ${DEBUG_LOG}
@ -96,7 +96,7 @@ function distro_check {
echo >> ${DEBUG_LOG}
}
function ip_check {
ip_check() {
echo "############################################################" >> ${DEBUG_LOG}
echo "######## IP Address Information #########" >> ${DEBUG_LOG}
echo "############################################################" >> ${DEBUG_LOG}
@ -166,7 +166,7 @@ function ip_check {
echo >> ${DEBUG_LOG}
}
function hostnameCheck {
hostnameCheck() {
echo "############################################################" >> ${DEBUG_LOG}
echo "######## Hostname Information #########" >> ${DEBUG_LOG}
echo "############################################################" >> ${DEBUG_LOG}
@ -188,7 +188,7 @@ function hostnameCheck {
fi
}
function portCheck {
portCheck() {
echo "############################################################" >> ${DEBUG_LOG}
echo "######## Open Port Information #########" >> ${DEBUG_LOG}
echo "############################################################" >> ${DEBUG_LOG}
@ -200,7 +200,7 @@ function portCheck {
echo >> ${DEBUG_LOG}
}
function testResolver {
testResolver() {
echo "############################################################" >> ${DEBUG_LOG}
echo "############ Resolver Functions Check ############" >> ${DEBUG_LOG}
echo "############################################################" >> ${DEBUG_LOG}
@ -262,7 +262,7 @@ function testResolver {
echo >> ${DEBUG_LOG}
}
function checkProcesses {
checkProcesses() {
echo "#######################################" >> ${DEBUG_LOG}
echo "########### Processes Check ###########" >> ${DEBUG_LOG}
echo "#######################################" >> ${DEBUG_LOG}
@ -279,7 +279,7 @@ function checkProcesses {
echo >> ${DEBUG_LOG}
}
function debugLighttpd {
debugLighttpd() {
echo "::: Writing lighttpd to debug log..."
echo "#######################################" >> ${DEBUG_LOG}
echo "############ lighttpd.conf ############" >> ${DEBUG_LOG}
@ -420,7 +420,7 @@ fi
# Continuously append the pihole.log file to the pihole_debug.log file
function dumpPiHoleLog {
dumpPiHoleLog() {
trap '{ echo -e "\n::: Finishing debug write from interrupt... Quitting!" ; exit 1; }' INT
echo -e "::: Writing current Pi-hole traffic to debug log...\n:::\tTry loading any/all sites that you are having trouble with now... \n:::\t(Press ctrl+C to finish)"
echo "#######################################" >> ${DEBUG_LOG}
@ -439,7 +439,7 @@ function dumpPiHoleLog {
}
# Anything to be done after capturing of pihole.log terminates
function finalWork {
finalWork() {
echo "::: Finshed debugging!"
echo "::: The debug log can be uploaded to Termbin.com for easier sharing."
read -r -p "::: Would you like to upload the log? [y/N] " response

3
advanced/Scripts/update.sh
View File

@ -17,8 +17,7 @@ webInterfaceDir="/var/www/html/admin"
piholeGitUrl="https://github.com/pi-hole/pi-hole.git"
piholeFilesDir="/etc/.pihole"
spinner()
{
spinner() {
local pid=$1
local delay=0.50
local spinstr='/-\|'

3
advanced/Scripts/version.sh
View File

@ -71,8 +71,7 @@ coreOutput(){
fi
}
helpFunc()
{
helpFunc() {
echo ":::"
echo "::: Show Pi-hole/Web Admin versions"
echo ":::"

3
advanced/Scripts/whitelist.sh
View File

@ -11,8 +11,7 @@
# (at your option) any later version.
helpFunc()
{
helpFunc() {
echo "::: Immediately whitelists one or more domains in the hosts file"
echo ":::"
echo "::: Usage: pihole -w domain1 [domain2 ...]"

6
automated install/basic-install.sh
View File

@ -121,8 +121,7 @@ else
fi
####### FUNCTIONS ##########
spinner()
{
spinner() {
local pid=$1
local delay=0.50
local spinstr='/-\|'
@ -389,8 +388,7 @@ setStaticIPv4() {
fi
}
function valid_ip()
{
valid_ip() {
local ip=$1
local stat=1

7
automated install/uninstall.sh
View File

@ -58,8 +58,7 @@ else
exit
fi
spinner()
{
spinner() {
local pid=$1
local delay=0.50
local spinstr='/-\|'
@ -73,7 +72,7 @@ spinner()
printf " \b\b\b\b"
}
function removeAndPurge {
removeAndPurge() {
# Purge dependencies
echo ":::"
for i in "${PIHOLE_DEPS[@]}"; do
@ -104,7 +103,7 @@ echo ":::"
removeNoPurge
}
function removeNoPurge {
removeNoPurge() {
echo ":::"
# Only web directories/files that are created by pihole should be removed.
echo "::: Removing the Pi-hole Web server files..."

3
gravity.sh
View File

@ -13,8 +13,7 @@
# Run this script as root or under sudo
echo ":::"
helpFunc()
{
helpFunc() {
echo "::: Pull in domains from adlists"
echo ":::"
echo "::: Usage: pihole -g"