File pihole-script-cleanups.patch of Package pi-hole

Overview Repositories Revisions Requests Users Attributes Meta

File pihole-script-cleanups.patch of Package pi-hole (Revision 701297d78c557d48bbf62b46d824592e)

Currently displaying revision 701297d78c557d48bbf62b46d824592e , Show latest

Index: pi-hole-5.2.4/advanced/Scripts/chronometer.sh
===================================================================
--- pi-hole-5.2.4.orig/advanced/Scripts/chronometer.sh
+++ pi-hole-5.2.4/advanced/Scripts/chronometer.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 # shellcheck disable=SC1090,SC1091
 # Pi-hole: A black hole for Internet advertisements
 # (c) 2017 Pi-hole, LLC (https://pi-hole.net)
@@ -134,7 +134,7 @@ get_init_stats() {
     }
 
     # Set Color Codes
-    coltable="/opt/pihole/COL_TABLE"
+    coltable="/usr/share/pi-hole/COL_TABLE"
     if [[ -f "${coltable}" ]]; then
         source ${coltable}
     else
Index: pi-hole-5.2.4/advanced/Scripts/list.sh
===================================================================
--- pi-hole-5.2.4.orig/advanced/Scripts/list.sh
+++ pi-hole-5.2.4/advanced/Scripts/list.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 # Pi-hole: A black hole for Internet advertisements
 # (c) 2017 Pi-hole, LLC (https://pi-hole.net)
 # Network-wide ad blocking via your own hardware.
@@ -26,7 +26,7 @@ comment=""
 declare -i domaincount
 domaincount=0
 
-colfile="/opt/pihole/COL_TABLE"
+colfile="/usr/share/pi-hole/COL_TABLE"
 source ${colfile}
 
 # IDs are hard-wired to domain interpretation in the gravity database scheme
Index: pi-hole-5.2.4/advanced/Scripts/piholeDebug.sh
===================================================================
--- pi-hole-5.2.4.orig/advanced/Scripts/piholeDebug.sh
+++ pi-hole-5.2.4/advanced/Scripts/piholeDebug.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 # Pi-hole: A black hole for Internet advertisements
 # (c) 2017 Pi-hole, LLC (https://pi-hole.net)
 # Network-wide ad blocking via your own hardware.
@@ -22,7 +22,7 @@ set -o pipefail
 ######## GLOBAL VARS ########
 # These variables would normally be next to the other files
 # but we need them to be first in order to get the colors needed for the script output
-PIHOLE_SCRIPTS_DIRECTORY="/opt/pihole"
+PIHOLE_SCRIPTS_DIRECTORY="/usr/share/pi-hole"
 PIHOLE_COLTABLE_FILE="${PIHOLE_SCRIPTS_DIRECTORY}/COL_TABLE"
 
 # These provide the colors we need for making the log more readable
@@ -68,8 +68,8 @@ CORE_GIT_DIRECTORY="/etc/.pihole"
 CRON_D_DIRECTORY="/etc/cron.d"
 DNSMASQ_D_DIRECTORY="/etc/dnsmasq.d"
 PIHOLE_DIRECTORY="/etc/pihole"
-PIHOLE_SCRIPTS_DIRECTORY="/opt/pihole"
-BIN_DIRECTORY="/usr/local/bin"
+PIHOLE_SCRIPTS_DIRECTORY="/usr/share/pi-hole"
+BIN_DIRECTORY="/usr/bin"
 RUN_DIRECTORY="/run"
 LOG_DIRECTORY="/var/log"
 WEB_SERVER_LOG_DIRECTORY="${LOG_DIRECTORY}/lighttpd"
Index: pi-hole-5.2.4/advanced/Scripts/piholeLogFlush.sh
===================================================================
--- pi-hole-5.2.4.orig/advanced/Scripts/piholeLogFlush.sh
+++ pi-hole-5.2.4/advanced/Scripts/piholeLogFlush.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 # Pi-hole: A black hole for Internet advertisements
 # (c) 2017 Pi-hole, LLC (https://pi-hole.net)
 # Network-wide ad blocking via your own hardware.
@@ -8,7 +8,7 @@
 # This file is copyright under the latest version of the EUPL.
 # Please see LICENSE file for your rights under this license.
 
-colfile="/opt/pihole/COL_TABLE"
+colfile="/usr/share/pi-hole/COL_TABLE"
 source ${colfile}
 
 # Determine database location
Index: pi-hole-5.2.4/advanced/Scripts/query.sh
===================================================================
--- pi-hole-5.2.4.orig/advanced/Scripts/query.sh
+++ pi-hole-5.2.4/advanced/Scripts/query.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 # shellcheck disable=SC1090
 # Pi-hole: A black hole for Internet advertisements
 # (c) 2018 Pi-hole, LLC (https://pi-hole.net)
@@ -18,7 +18,7 @@ exact=""
 blockpage=""
 matchType="match"
 
-colfile="/opt/pihole/COL_TABLE"
+colfile="/usr/share/pi-hole/COL_TABLE"
 source "${colfile}"
 
 # Scan an array of files for matching strings
Index: pi-hole-5.2.4/advanced/Scripts/version.sh
===================================================================
--- pi-hole-5.2.4.orig/advanced/Scripts/version.sh
+++ pi-hole-5.2.4/advanced/Scripts/version.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 # Pi-hole: A black hole for Internet advertisements
 # (c) 2017 Pi-hole, LLC (https://pi-hole.net)
 # Network-wide ad blocking via your own hardware.
Index: pi-hole-5.2.4/gravity.sh
===================================================================
--- pi-hole-5.2.4.orig/gravity.sh
+++ pi-hole-5.2.4/gravity.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 # shellcheck disable=SC1090
 
 # Pi-hole: A black hole for Internet advertisements
@@ -13,15 +13,15 @@
 
 export LC_ALL=C
 
-coltable="/opt/pihole/COL_TABLE"
+coltable="/usr/share/pi-hole/COL_TABLE"
 source "${coltable}"
-regexconverter="/opt/pihole/wildcard_regex_converter.sh"
+regexconverter="/usr/share/pi-hole/wildcard_regex_converter.sh"
 source "${regexconverter}"
 # shellcheck disable=SC1091
 source "/etc/.pihole/advanced/Scripts/database_migration/gravity-db.sh"
 
 basename="pihole"
-PIHOLE_COMMAND="/usr/local/bin/${basename}"
+PIHOLE_COMMAND="/usr/bin/${basename}"
 
 piholeDir="/etc/${basename}"
 
Index: pi-hole-5.2.4/pihole
===================================================================
--- pi-hole-5.2.4.orig/pihole
+++ pi-hole-5.2.4/pihole
@@ -15,7 +15,7 @@ readonly PI_HOLE_SCRIPT_DIR="/opt/pihole
 # they might get set again when the installer is sourced. This causes an
 # error due to modifying a readonly variable.
 setupVars="/etc/pihole/setupVars.conf"
-PI_HOLE_BIN_DIR="/usr/local/bin"
+PI_HOLE_BIN_DIR="/usr/bin"
 
 readonly colfile="${PI_HOLE_SCRIPT_DIR}/COL_TABLE"
 source "${colfile}"

Places

File pihole-script-cleanups.patch of Package pi-hole (Revision 701297d78c557d48bbf62b46d824592e)

Places