Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-29 01:23:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

add jq to install script

Browse source
This commit is contained in:
Tommy Huff 2016-10-25 19:09:07 -04:00
parent 48faf1aa96
commit 9bba4c57ef
2 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
advanced/Scripts/chronometer.sh
View file

@ -14,19 +14,13 @@
#Functions############################################################################################################## #Functions##############################################################################################################
#move to pihole #move to pihole
if [ ! -f "/opt/pihole/jq" ] ; then
curl -s http://stedolan.github.io/jq/download/linux64/jq -o /opt/pihole/jq
chmod 755 /opt/pihole/jq
fi
statsUpdateJSON() { statsUpdateJSON() {
if [[ -z "${AdminLink}" ]] ; then if [[ -z "${AdminLink}" ]] ; then
AdminLink="http://127.0.0.1/admin" AdminLink="http://127.0.0.1/admin"
fi fi
local x=$(curl -s ${AdminLink}/api.php?summaryRaw) local x=$(curl -s ${AdminLink}/api.php?summaryRaw)
#check if json is valid #check if json is valid
if echo "${x}" | /opt/pihole/jq "." > /dev/null ; then if echo "${x}" | jq "." > /dev/null ; then
echo "${x}" echo "${x}"
else else
echo "Error" echo "Error"
@ -40,7 +34,7 @@ statsBlockedDomains() {
fi fi
if [[ "${json}" != "Error" ]] ; then if [[ "${json}" != "Error" ]] ; then
# local x=$(echo "${json}" | python -c "import sys, json; print json.load(sys.stdin)['domains_being_blocked']") # local x=$(echo "${json}" | python -c "import sys, json; print json.load(sys.stdin)['domains_being_blocked']")
local x=$(echo "${json}" | /opt/pihole/jq ".domains_being_blocked" | tr -d '"') local x=$(echo "${json}" | jq ".domains_being_blocked" | tr -d '"')
echo ${x} echo ${x}
else else
echo "Error" echo "Error"
@ -53,7 +47,7 @@ statsQueriesToday() {
json=$(statsUpdateJSON) json=$(statsUpdateJSON)
fi fi
if [[ "${json}" != "Error" ]] ; then if [[ "${json}" != "Error" ]] ; then
local x=$(echo "${json}" | /opt/pihole/jq ".dns_queries_today" | tr -d '"') local x=$(echo "${json}" | jq ".dns_queries_today" | tr -d '"')
echo ${x} echo ${x}
else else
echo "Error" echo "Error"
@ -66,7 +60,7 @@ statsBlockedToday() {
json=$(statsUpdateJSON) json=$(statsUpdateJSON)
fi fi
if [[ "${json}" != "Error" ]] ; then if [[ "${json}" != "Error" ]] ; then
local x=$(echo "${json}" | /opt/pihole/jq ".ads_blocked_today" | tr -d '"') local x=$(echo "${json}" | jq ".ads_blocked_today" | tr -d '"')
echo ${x} echo ${x}
else else
echo "Error" echo "Error"
@ -79,7 +73,7 @@ statsPercentBlockedToday() {
json=$(statsUpdateJSON) json=$(statsUpdateJSON)
fi fi
if [[ "${json}" != "Error" ]] ; then if [[ "${json}" != "Error" ]] ; then
local x=$(echo "${json}" | /opt/pihole/jq ".ads_percentage_today" | tr -d '"' | xargs printf "%.*f\n" 2) local x=$(echo "${json}" | jq ".ads_percentage_today" | tr -d '"' | xargs printf "%.*f\n" 2)
echo ${x} echo ${x}
else else
echo "Error" echo "Error"

2
automated install/basic-install.sh
View file

@ -83,7 +83,7 @@ if [ -x "$(command -v apt-get)" ]; then
# grep -c will return 1 retVal on 0 matches, block this throwing the set -e with an OR TRUE # grep -c will return 1 retVal on 0 matches, block this throwing the set -e with an OR TRUE
PKG_COUNT="${PKG_MANAGER} -s -o Debug::NoLocking=true upgrade | grep -c ^Inst || true" PKG_COUNT="${PKG_MANAGER} -s -o Debug::NoLocking=true upgrade | grep -c ^Inst || true"
INSTALLER_DEPS=( apt-utils whiptail git dhcpcd5) INSTALLER_DEPS=( apt-utils whiptail git dhcpcd5)
PIHOLE_DEPS=( dnsutils bc dnsmasq lighttpd ${phpVer}-common ${phpVer}-cgi curl unzip wget sudo netcat cron iproute2 ) PIHOLE_DEPS=( dnsutils bc dnsmasq lighttpd ${phpVer}-common ${phpVer}-cgi curl unzip wget sudo netcat cron iproute2 jq)
LIGHTTPD_USER="www-data" LIGHTTPD_USER="www-data"
LIGHTTPD_GROUP="www-data" LIGHTTPD_GROUP="www-data"
LIGHTTPD_CFG="lighttpd.conf.debian" LIGHTTPD_CFG="lighttpd.conf.debian"