File 001_pi-hole_move_to_datadir.patch of Package pi-hole

Overview Repositories Revisions Requests Users Attributes Meta

File 001_pi-hole_move_to_datadir.patch of Package pi-hole (Revision 3d360b5b300f697c85fe9829e45ae6a0)

Currently displaying revision 3d360b5b300f697c85fe9829e45ae6a0 , Show latest

diff -uNr pi-hole-5.16.1.orig/advanced/Scripts/chronometer.sh pi-hole-5.16.1/advanced/Scripts/chronometer.sh
--- pi-hole-5.16.1.orig/advanced/Scripts/chronometer.sh	2023-03-24 10:01:08.354453710 +0100
+++ pi-hole-5.16.1/advanced/Scripts/chronometer.sh	2023-03-24 10:01:27.203753099 +0100
@@ -15,7 +15,7 @@
 pihole-FTL() {
     local ftl_port LINE
     # shellcheck disable=SC1091
-    . /opt/pihole/utils.sh
+    . /usr/share/pi-hole/utils.sh
     ftl_port=$(getFTLAPIPort)
     if [[ -n "$ftl_port" ]]; then
         # Open connection to FTL
@@ -136,7 +136,7 @@
     }
 
     # Set Color Codes
-    coltable="/opt/pihole/COL_TABLE"
+    coltable="/usr/share/pi-hole/COL_TABLE"
     if [[ -f "${coltable}" ]]; then
         source ${coltable}
     else
diff -uNr pi-hole-5.16.1.orig/advanced/Scripts/list.sh pi-hole-5.16.1/advanced/Scripts/list.sh
--- pi-hole-5.16.1.orig/advanced/Scripts/list.sh	2023-03-24 10:01:08.355453725 +0100
+++ pi-hole-5.16.1/advanced/Scripts/list.sh	2023-03-24 10:01:27.205753131 +0100
@@ -37,7 +37,7 @@
 domaincount=0
 reload=false
 
-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
diff -uNr pi-hole-5.16.1.orig/advanced/Scripts/piholeARPTable.sh pi-hole-5.16.1/advanced/Scripts/piholeARPTable.sh
--- pi-hole-5.16.1.orig/advanced/Scripts/piholeARPTable.sh	2023-03-24 10:01:08.355453725 +0100
+++ pi-hole-5.16.1/advanced/Scripts/piholeARPTable.sh	2023-03-24 10:01:27.205753131 +0100
@@ -10,7 +10,7 @@
 # This file is copyright under the latest version of the EUPL.
 # Please see LICENSE file for your rights under this license.
 
-coltable="/opt/pihole/COL_TABLE"
+coltable="/usr/share/pi-hole/COL_TABLE"
 if [[ -f ${coltable} ]]; then
     source ${coltable}
 fi
diff -uNr pi-hole-5.16.1.orig/advanced/Scripts/piholeCheckout.sh pi-hole-5.16.1/advanced/Scripts/piholeCheckout.sh
--- pi-hole-5.16.1.orig/advanced/Scripts/piholeCheckout.sh	2023-03-24 10:01:08.355453725 +0100
+++ pi-hole-5.16.1/advanced/Scripts/piholeCheckout.sh	2023-03-24 10:01:27.205753131 +0100
@@ -165,7 +165,7 @@
         fi
         checkout_pull_branch "${webInterfaceDir}" "${2}"
         # Update local and remote versions via updatechecker
-        /opt/pihole/updatecheck.sh
+        /usr/share/pi-hole/updatecheck.sh
     elif [[ "${1}" == "ftl" ]] ; then
         local path
         local oldbranch
@@ -181,7 +181,7 @@
             restart_service pihole-FTL
             enable_service pihole-FTL
             # Update local and remote versions via updatechecker
-            /opt/pihole/updatecheck.sh
+            /usr/share/pi-hole/updatecheck.sh
         else
             echo "  ${CROSS} Requested branch \"${2}\" is not available"
             ftlbranches=( $(git ls-remote https://github.com/pi-hole/ftl | grep 'heads' | sed 's/refs\/heads\///;s/ //g' | awk '{print $2}') )
diff -uNr pi-hole-5.16.1.orig/advanced/Scripts/piholeDebug.sh pi-hole-5.16.1/advanced/Scripts/piholeDebug.sh
--- pi-hole-5.16.1.orig/advanced/Scripts/piholeDebug.sh	2023-03-24 10:01:08.355453725 +0100
+++ pi-hole-5.16.1/advanced/Scripts/piholeDebug.sh	2023-03-24 10:01:27.206753147 +0100
@@ -22,7 +22,7 @@
 ######## 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
@@ -60,7 +60,7 @@
 CRON_D_DIRECTORY="/etc/cron.d"
 DNSMASQ_D_DIRECTORY="/etc/dnsmasq.d"
 PIHOLE_DIRECTORY="/etc/pihole"
-PIHOLE_SCRIPTS_DIRECTORY="/opt/pihole"
+PIHOLE_SCRIPTS_DIRECTORY="/usr/share/pi-hole"
 BIN_DIRECTORY="/usr/local/bin"
 RUN_DIRECTORY="/run"
 LOG_DIRECTORY="/var/log/pihole"
diff -uNr pi-hole-5.16.1.orig/advanced/Scripts/piholeLogFlush.sh pi-hole-5.16.1/advanced/Scripts/piholeLogFlush.sh
--- pi-hole-5.16.1.orig/advanced/Scripts/piholeLogFlush.sh	2023-03-24 10:01:08.355453725 +0100
+++ pi-hole-5.16.1/advanced/Scripts/piholeLogFlush.sh	2023-03-24 10:01:27.206753147 +0100
@@ -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}
 
 # In case we're running at the same time as a system logrotate, use a
diff -uNr pi-hole-5.16.1.orig/advanced/Scripts/query.sh pi-hole-5.16.1/advanced/Scripts/query.sh
--- pi-hole-5.16.1.orig/advanced/Scripts/query.sh	2023-03-24 10:01:08.355453725 +0100
+++ pi-hole-5.16.1/advanced/Scripts/query.sh	2023-03-24 10:01:27.206753147 +0100
@@ -27,7 +27,7 @@
 # have changed
 gravityDBfile="${GRAVITYDB}"
 
-colfile="/opt/pihole/COL_TABLE"
+colfile="/usr/share/pi-hole/COL_TABLE"
 source "${colfile}"
 
 if [[ "${options}" == "-h" ]] || [[ "${options}" == "--help" ]]; then
diff -uNr pi-hole-5.16.1.orig/advanced/Scripts/updatecheck.sh pi-hole-5.16.1/advanced/Scripts/updatecheck.sh
--- pi-hole-5.16.1.orig/advanced/Scripts/updatecheck.sh	2023-03-24 10:01:08.356453741 +0100
+++ pi-hole-5.16.1/advanced/Scripts/updatecheck.sh	2023-03-24 10:01:27.206753147 +0100
@@ -40,7 +40,7 @@
 
 # Source the utils file for addOrEditKeyValPair()
 # shellcheck disable=SC1091
-. /opt/pihole/utils.sh
+. /usr/share/pi-hole/utils.sh
 
 # Remove the below three legacy files if they exist
 rm -f "/etc/pihole/GitHubVersions"
diff -uNr pi-hole-5.16.1.orig/advanced/Scripts/update.sh pi-hole-5.16.1/advanced/Scripts/update.sh
--- pi-hole-5.16.1.orig/advanced/Scripts/update.sh	2023-03-24 10:01:08.355453725 +0100
+++ pi-hole-5.16.1/advanced/Scripts/update.sh	2023-03-24 10:01:27.206753147 +0100
@@ -25,7 +25,7 @@
 # shellcheck disable=SC1090
 source "${PI_HOLE_FILES_DIR}/automated install/basic-install.sh"
 # shellcheck disable=SC1091
-source "/opt/pihole/COL_TABLE"
+source "/usr/share/pi-hole/COL_TABLE"
 
 # is_repo() sourced from basic-install.sh
 # make_repo() sourced from basic-install.sh
@@ -217,7 +217,7 @@
 
     if [[ "${FTL_update}" == true || "${core_update}" == true || "${web_update}" == true ]]; then
         # Update local and remote versions via updatechecker
-        /opt/pihole/updatecheck.sh
+        /usr/share/pi-hole/updatecheck.sh
         echo -e "  ${INFO} Local version file information updated."
     fi
 
diff -uNr pi-hole-5.16.1.orig/advanced/Scripts/webpage.sh pi-hole-5.16.1/advanced/Scripts/webpage.sh
--- pi-hole-5.16.1.orig/advanced/Scripts/webpage.sh	2023-03-24 10:01:08.356453741 +0100
+++ pi-hole-5.16.1/advanced/Scripts/webpage.sh	2023-03-24 10:01:27.207753162 +0100
@@ -28,10 +28,10 @@
 SKIP_INSTALL="true"
 source "${PI_HOLE_FILES_DIR}/automated install/basic-install.sh"
 
-utilsfile="/opt/pihole/utils.sh"
+utilsfile="/usr/share/pi-hole/utils.sh"
 source "${utilsfile}"
 
-coltable="/opt/pihole/COL_TABLE"
+coltable="/usr/share/pi-hole/COL_TABLE"
 if [[ -f ${coltable} ]]; then
     source ${coltable}
 fi
diff -uNr pi-hole-5.16.1.orig/advanced/Templates/pihole-FTL-poststop.sh pi-hole-5.16.1/advanced/Templates/pihole-FTL-poststop.sh
--- pi-hole-5.16.1.orig/advanced/Templates/pihole-FTL-poststop.sh	2023-03-24 10:01:08.358453773 +0100
+++ pi-hole-5.16.1/advanced/Templates/pihole-FTL-poststop.sh	2023-03-24 10:01:27.207753162 +0100
@@ -1,7 +1,7 @@
 #!/usr/bin/env sh
 
 # Source utils.sh for getFTLPIDFile()
-PI_HOLE_SCRIPT_DIR='/opt/pihole'
+PI_HOLE_SCRIPT_DIR='/usr/share/pi-hole'
 utilsfile="${PI_HOLE_SCRIPT_DIR}/utils.sh"
 # shellcheck disable=SC1090
 . "${utilsfile}"
diff -uNr pi-hole-5.16.1.orig/advanced/Templates/pihole-FTL-prestart.sh pi-hole-5.16.1/advanced/Templates/pihole-FTL-prestart.sh
--- pi-hole-5.16.1.orig/advanced/Templates/pihole-FTL-prestart.sh	2023-03-24 10:01:08.358453773 +0100
+++ pi-hole-5.16.1/advanced/Templates/pihole-FTL-prestart.sh	2023-03-24 10:01:27.207753162 +0100
@@ -1,7 +1,7 @@
 #!/usr/bin/env sh
 
 # Source utils.sh for getFTLPIDFile()
-PI_HOLE_SCRIPT_DIR='/opt/pihole'
+PI_HOLE_SCRIPT_DIR='/usr/share/pi-hole'
 utilsfile="${PI_HOLE_SCRIPT_DIR}/utils.sh"
 # shellcheck disable=SC1090
 . "${utilsfile}"
diff -uNr pi-hole-5.16.1.orig/advanced/Templates/pihole-FTL.service pi-hole-5.16.1/advanced/Templates/pihole-FTL.service
--- pi-hole-5.16.1.orig/advanced/Templates/pihole-FTL.service	2023-03-24 10:01:08.359453789 +0100
+++ pi-hole-5.16.1/advanced/Templates/pihole-FTL.service	2023-03-24 10:01:27.207753162 +0100
@@ -10,7 +10,7 @@
 ### END INIT INFO
 
 # Source utils.sh for getFTLPIDFile(), getFTLPID()
-PI_HOLE_SCRIPT_DIR="/opt/pihole"
+PI_HOLE_SCRIPT_DIR="/usr/share/pi-hole"
 utilsfile="${PI_HOLE_SCRIPT_DIR}/utils.sh"
 # shellcheck disable=SC1090
 . "${utilsfile}"
diff -uNr pi-hole-5.16.1.orig/advanced/Templates/pihole-FTL.systemd pi-hole-5.16.1/advanced/Templates/pihole-FTL.systemd
--- pi-hole-5.16.1.orig/advanced/Templates/pihole-FTL.systemd	2023-03-24 10:01:08.359453789 +0100
+++ pi-hole-5.16.1/advanced/Templates/pihole-FTL.systemd	2023-03-24 10:01:27.207753162 +0100
@@ -20,12 +20,12 @@
 PermissionsStartOnly=true
 AmbientCapabilities=CAP_NET_BIND_SERVICE CAP_NET_RAW CAP_NET_ADMIN CAP_SYS_NICE CAP_IPC_LOCK CAP_CHOWN
 
-ExecStartPre=/opt/pihole/pihole-FTL-prestart.sh
+ExecStartPre=/usr/share/pi-hole/pihole-FTL-prestart.sh
 ExecStart=/usr/bin/pihole-FTL -f
 Restart=on-failure
 RestartSec=5s
 ExecReload=/bin/kill -HUP $MAINPID
-ExecStopPost=/opt/pihole/pihole-FTL-poststop.sh
+ExecStopPost=/usr/share/pi-hole/pihole-FTL-poststop.sh
 
 # Use graceful shutdown with a reasonable timeout
 TimeoutStopSec=10s
diff -uNr "pi-hole-5.16.1.orig/automated install/basic-install.sh" "pi-hole-5.16.1/automated install/basic-install.sh"
--- "pi-hole-5.16.1.orig/automated install/basic-install.sh"	2023-03-24 10:01:08.354453710 +0100
+++ "pi-hole-5.16.1/automated install/basic-install.sh"	2023-03-24 10:01:27.211753226 +0100
@@ -61,7 +61,7 @@
 # Pi-hole uses lighttpd as a Web server, and this is the config file for it
 lighttpdConfig="/etc/lighttpd/lighttpd.conf"
 # This is a file used for the colorized output
-coltable="/opt/pihole/COL_TABLE"
+coltable="/usr/share/pi-hole/COL_TABLE"
 
 # Root of the web server
 webroot="/var/www/html"
@@ -79,7 +79,7 @@
 # List of pihole scripts, stored in an array
 PI_HOLE_FILES=(chronometer list piholeDebug piholeLogFlush setupLCD update version gravity uninstall webpage)
 # This directory is where the Pi-hole scripts will be installed
-PI_HOLE_INSTALL_DIR="/opt/pihole"
+PI_HOLE_INSTALL_DIR="/usr/share/pi-hole"
 PI_HOLE_CONFIG_DIR="/etc/pihole"
 PI_HOLE_BIN_DIR="/usr/local/bin"
 FTL_CONFIG_FILE="${PI_HOLE_CONFIG_DIR}/pihole-FTL.conf"
@@ -1759,7 +1759,7 @@
 # which is what Pi-hole needs to begin blocking ads
 runGravity() {
     # Run gravity in the current shell
-    { /opt/pihole/gravity.sh --force; }
+    { /usr/share/pi-hole/gravity.sh --force; }
 }
 
 # Check if the pihole user exists and create if it does not
@@ -1929,12 +1929,12 @@
         exit 1
     fi
 
-    # /opt/pihole/utils.sh should be installed by installScripts now, so we can use it
+    # /usr/share/pi-hole/utils.sh should be installed by installScripts now, so we can use it
     if [ -f "${PI_HOLE_INSTALL_DIR}/utils.sh" ]; then
         # shellcheck disable=SC1091
         source "${PI_HOLE_INSTALL_DIR}/utils.sh"
     else
-        printf "  %b Failure: /opt/pihole/utils.sh does not exist .\\n" "${CROSS}"
+        printf "  %b Failure: /usr/share/pi-hole/utils.sh does not exist .\\n" "${CROSS}"
         exit 1
     fi
 
@@ -2674,7 +2674,7 @@
             # generate a random password
             pw=$(tr -dc _A-Z-a-z-0-9 < /dev/urandom | head -c 8)
             # shellcheck disable=SC1091
-            . /opt/pihole/webpage.sh
+            . /usr/share/pi-hole/webpage.sh
             echo "WEBPASSWORD=$(HashPassword "${pw}")" >> "${setupVars}"
         fi
     fi
@@ -2738,7 +2738,7 @@
     runGravity
 
     # Update local and remote versions via updatechecker
-    /opt/pihole/updatecheck.sh
+    /usr/share/pi-hole/updatecheck.sh
 
     if [[ "${useUpdateVars}" == false ]]; then
         displayFinalMessage "${pw}"
diff -uNr "pi-hole-5.16.1.orig/automated install/uninstall.sh" "pi-hole-5.16.1/automated install/uninstall.sh"
--- "pi-hole-5.16.1.orig/automated install/uninstall.sh"	2023-03-24 10:01:08.354453710 +0100
+++ "pi-hole-5.16.1/automated install/uninstall.sh"	2023-03-24 10:01:27.211753226 +0100
@@ -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.
 
-source "/opt/pihole/COL_TABLE"
+source "/usr/share/pi-hole/COL_TABLE"
 
 while true; do
     read -rp "  ${QST} Are you sure you would like to remove ${COL_WHITE}Pi-hole${COL_NC}? [y/N] " answer
@@ -173,7 +173,7 @@
     ${SUDO} rm -rf /var/log/pihole/*pihole* &> /dev/null
     ${SUDO} rm -rf /etc/pihole/ &> /dev/null
     ${SUDO} rm -rf /etc/.pihole/ &> /dev/null
-    ${SUDO} rm -rf /opt/pihole/ &> /dev/null
+    ${SUDO} rm -rf /usr/share/pi-hole/ &> /dev/null
     ${SUDO} rm -f /usr/local/bin/pihole &> /dev/null
     ${SUDO} rm -f /etc/bash_completion.d/pihole &> /dev/null
     ${SUDO} rm -f /etc/sudoers.d/pihole &> /dev/null
diff -uNr pi-hole-5.16.1.orig/gravity.sh pi-hole-5.16.1/gravity.sh
--- pi-hole-5.16.1.orig/gravity.sh	2023-03-24 10:01:08.352453677 +0100
+++ pi-hole-5.16.1/gravity.sh	2023-03-24 10:01:27.211753226 +0100
@@ -13,7 +13,7 @@
 
 export LC_ALL=C
 
-coltable="/opt/pihole/COL_TABLE"
+coltable="/usr/share/pi-hole/COL_TABLE"
 source "${coltable}"
 # shellcheck disable=SC1091
 source "/etc/.pihole/advanced/Scripts/database_migration/gravity-db.sh"
diff -uNr pi-hole-5.16.1.orig/pihole pi-hole-5.16.1/pihole
--- pi-hole-5.16.1.orig/pihole	2023-03-24 10:01:08.352453677 +0100
+++ pi-hole-5.16.1/pihole	2023-03-24 10:01:27.211753226 +0100
@@ -9,7 +9,7 @@
 # This file is copyright under the latest version of the EUPL.
 # Please see LICENSE file for your rights under this license.
 
-readonly PI_HOLE_SCRIPT_DIR="/opt/pihole"
+readonly PI_HOLE_SCRIPT_DIR="/usr/share/pi-hole"
 
 # setupVars and PI_HOLE_BIN_DIR are not readonly here because in some functions (checkout),
 # they might get set again when the installer is sourced. This causes an
diff -uNr pi-hole-5.16.1.orig/test/_centos_8.Dockerfile pi-hole-5.16.1/test/_centos_8.Dockerfile
--- pi-hole-5.16.1.orig/test/_centos_8.Dockerfile	2023-03-24 10:01:08.360453804 +0100
+++ pi-hole-5.16.1/test/_centos_8.Dockerfile	2023-03-24 10:01:27.211753226 +0100
@@ -2,7 +2,7 @@
 RUN yum install -y git initscripts
 
 ENV GITDIR /etc/.pihole
-ENV SCRIPTDIR /opt/pihole
+ENV SCRIPTDIR /usr/share/pi-hole
 
 RUN mkdir -p $GITDIR $SCRIPTDIR /etc/pihole
 ADD . $GITDIR
@@ -15,4 +15,4 @@
 ENV SKIP_INSTALL true
 ENV OS_CHECK_DOMAIN_NAME dev-supportedos.pi-hole.net
 
-#sed '/# Start the installer/Q' /opt/pihole/basic-install.sh > /opt/pihole/stub_basic-install.sh && \
+#sed '/# Start the installer/Q' /usr/share/pi-hole/basic-install.sh > /usr/share/pi-hole/stub_basic-install.sh && \
diff -uNr pi-hole-5.16.1.orig/test/_centos_9.Dockerfile pi-hole-5.16.1/test/_centos_9.Dockerfile
--- pi-hole-5.16.1.orig/test/_centos_9.Dockerfile	2023-03-24 10:01:08.360453804 +0100
+++ pi-hole-5.16.1/test/_centos_9.Dockerfile	2023-03-24 10:01:27.211753226 +0100
@@ -2,7 +2,7 @@
 RUN yum install -y --allowerasing curl git initscripts
 
 ENV GITDIR /etc/.pihole
-ENV SCRIPTDIR /opt/pihole
+ENV SCRIPTDIR /usr/share/pi-hole
 
 RUN mkdir -p $GITDIR $SCRIPTDIR /etc/pihole
 ADD . $GITDIR
@@ -15,4 +15,4 @@
 ENV SKIP_INSTALL true
 ENV OS_CHECK_DOMAIN_NAME dev-supportedos.pi-hole.net
 
-#sed '/# Start the installer/Q' /opt/pihole/basic-install.sh > /opt/pihole/stub_basic-install.sh && \
+#sed '/# Start the installer/Q' /usr/share/pi-hole/basic-install.sh > /usr/share/pi-hole/stub_basic-install.sh && \
diff -uNr pi-hole-5.16.1.orig/test/_debian_10.Dockerfile pi-hole-5.16.1/test/_debian_10.Dockerfile
--- pi-hole-5.16.1.orig/test/_debian_10.Dockerfile	2023-03-24 10:01:08.360453804 +0100
+++ pi-hole-5.16.1/test/_debian_10.Dockerfile	2023-03-24 10:01:27.212753242 +0100
@@ -1,7 +1,7 @@
 FROM buildpack-deps:buster-scm
 
 ENV GITDIR /etc/.pihole
-ENV SCRIPTDIR /opt/pihole
+ENV SCRIPTDIR /usr/share/pi-hole
 
 RUN mkdir -p $GITDIR $SCRIPTDIR /etc/pihole
 ADD . $GITDIR
@@ -14,4 +14,4 @@
 ENV SKIP_INSTALL true
 ENV OS_CHECK_DOMAIN_NAME dev-supportedos.pi-hole.net
 
-#sed '/# Start the installer/Q' /opt/pihole/basic-install.sh > /opt/pihole/stub_basic-install.sh && \
+#sed '/# Start the installer/Q' /usr/share/pi-hole/basic-install.sh > /usr/share/pi-hole/stub_basic-install.sh && \
diff -uNr pi-hole-5.16.1.orig/test/_debian_11.Dockerfile pi-hole-5.16.1/test/_debian_11.Dockerfile
--- pi-hole-5.16.1.orig/test/_debian_11.Dockerfile	2023-03-24 10:01:08.360453804 +0100
+++ pi-hole-5.16.1/test/_debian_11.Dockerfile	2023-03-24 10:01:27.212753242 +0100
@@ -1,7 +1,7 @@
 FROM buildpack-deps:bullseye-scm
 
 ENV GITDIR /etc/.pihole
-ENV SCRIPTDIR /opt/pihole
+ENV SCRIPTDIR /usr/share/pi-hole
 
 RUN mkdir -p $GITDIR $SCRIPTDIR /etc/pihole
 ADD . $GITDIR
@@ -14,4 +14,4 @@
 ENV SKIP_INSTALL true
 ENV OS_CHECK_DOMAIN_NAME dev-supportedos.pi-hole.net
 
-#sed '/# Start the installer/Q' /opt/pihole/basic-install.sh > /opt/pihole/stub_basic-install.sh && \
+#sed '/# Start the installer/Q' /usr/share/pi-hole/basic-install.sh > /usr/share/pi-hole/stub_basic-install.sh && \
diff -uNr pi-hole-5.16.1.orig/test/_fedora_36.Dockerfile pi-hole-5.16.1/test/_fedora_36.Dockerfile
--- pi-hole-5.16.1.orig/test/_fedora_36.Dockerfile	2023-03-24 10:01:08.360453804 +0100
+++ pi-hole-5.16.1/test/_fedora_36.Dockerfile	2023-03-24 10:01:27.212753242 +0100
@@ -2,7 +2,7 @@
 RUN dnf install -y git initscripts
 
 ENV GITDIR /etc/.pihole
-ENV SCRIPTDIR /opt/pihole
+ENV SCRIPTDIR /usr/share/pi-hole
 
 RUN mkdir -p $GITDIR $SCRIPTDIR /etc/pihole
 ADD . $GITDIR
@@ -15,4 +15,4 @@
 ENV SKIP_INSTALL true
 ENV OS_CHECK_DOMAIN_NAME dev-supportedos.pi-hole.net
 
-#sed '/# Start the installer/Q' /opt/pihole/basic-install.sh > /opt/pihole/stub_basic-install.sh && \
+#sed '/# Start the installer/Q' /usr/share/pi-hole/basic-install.sh > /usr/share/pi-hole/stub_basic-install.sh && \
diff -uNr pi-hole-5.16.1.orig/test/_fedora_37.Dockerfile pi-hole-5.16.1/test/_fedora_37.Dockerfile
--- pi-hole-5.16.1.orig/test/_fedora_37.Dockerfile	2023-03-24 10:01:08.360453804 +0100
+++ pi-hole-5.16.1/test/_fedora_37.Dockerfile	2023-03-24 10:01:27.212753242 +0100
@@ -2,7 +2,7 @@
 RUN dnf install -y git initscripts
 
 ENV GITDIR /etc/.pihole
-ENV SCRIPTDIR /opt/pihole
+ENV SCRIPTDIR /usr/share/pi-hole
 
 RUN mkdir -p $GITDIR $SCRIPTDIR /etc/pihole
 ADD . $GITDIR
@@ -15,4 +15,4 @@
 ENV SKIP_INSTALL true
 ENV OS_CHECK_DOMAIN_NAME dev-supportedos.pi-hole.net
 
-#sed '/# Start the installer/Q' /opt/pihole/basic-install.sh > /opt/pihole/stub_basic-install.sh && \
+#sed '/# Start the installer/Q' /usr/share/pi-hole/basic-install.sh > /usr/share/pi-hole/stub_basic-install.sh && \
diff -uNr pi-hole-5.16.1.orig/test/test_any_automated_install.py pi-hole-5.16.1/test/test_any_automated_install.py
--- pi-hole-5.16.1.orig/test/test_any_automated_install.py	2023-03-24 10:01:08.361453821 +0100
+++ pi-hole-5.16.1/test/test_any_automated_install.py	2023-03-24 10:01:27.212753242 +0100
@@ -23,7 +23,7 @@
     host.run("rm -rf /usr/bin/rpm")
     package_manager_detect = host.run(
         """
-    source /opt/pihole/basic-install.sh
+    source /usr/share/pi-hole/basic-install.sh
     package_manager_detect
     """
     )
@@ -83,8 +83,8 @@
     set -e
     echo start
     TERM=xterm
-    source /opt/pihole/basic-install.sh
-    source /opt/pihole/utils.sh
+    source /usr/share/pi-hole/basic-install.sh
+    source /usr/share/pi-hole/utils.sh
     {}
     mkdir -p /etc/dnsmasq.d
     version_check_dnsmasq
@@ -109,7 +109,7 @@
     check_selinux = host.run(
         """
     rm -f /etc/selinux/config
-    source /opt/pihole/basic-install.sh
+    source /usr/share/pi-hole/basic-install.sh
     checkSelinux
     """
     )
@@ -125,7 +125,7 @@
     installWeb = host.run(
         """
     umask 0027
-    source /opt/pihole/basic-install.sh
+    source /usr/share/pi-hole/basic-install.sh
     installPiholeWeb
     """
     )
@@ -183,7 +183,7 @@
     umask 0027
     runUnattended=true
     useUpdateVars=true
-    source /opt/pihole/basic-install.sh > /dev/null
+    source /usr/share/pi-hole/basic-install.sh > /dev/null
     runUnattended=true
     useUpdateVars=true
     main
@@ -438,7 +438,7 @@
     umask 0027
     runUnattended=true
     useUpdateVars=true
-    source /opt/pihole/basic-install.sh > /dev/null
+    source /usr/share/pi-hole/basic-install.sh > /dev/null
     runUnattended=true
     useUpdateVars=true
     main
@@ -578,7 +578,7 @@
     """
     updateCache = host.run(
         """
-    source /opt/pihole/basic-install.sh
+    source /usr/share/pi-hole/basic-install.sh
     package_manager_detect
     update_package_cache
     """
@@ -595,7 +595,7 @@
     mock_command("apt-get", {"update": ("", "1")}, host)
     updateCache = host.run(
         """
-    source /opt/pihole/basic-install.sh
+    source /usr/share/pi-hole/basic-install.sh
     package_manager_detect
     update_package_cache
     """
@@ -622,7 +622,7 @@
     )
     detectPlatform = host.run(
         """
-    source /opt/pihole/basic-install.sh
+    source /usr/share/pi-hole/basic-install.sh
     create_pihole_user
     funcOutput=$(get_binary_name)
     binary="pihole-FTL${funcOutput##*pihole-FTL}"
@@ -655,7 +655,7 @@
     )
     detectPlatform = host.run(
         """
-    source /opt/pihole/basic-install.sh
+    source /usr/share/pi-hole/basic-install.sh
     create_pihole_user
     funcOutput=$(get_binary_name)
     binary="pihole-FTL${funcOutput##*pihole-FTL}"
@@ -688,7 +688,7 @@
     )
     detectPlatform = host.run(
         """
-    source /opt/pihole/basic-install.sh
+    source /usr/share/pi-hole/basic-install.sh
     create_pihole_user
     funcOutput=$(get_binary_name)
     binary="pihole-FTL${funcOutput##*pihole-FTL}"
@@ -721,7 +721,7 @@
     )
     detectPlatform = host.run(
         """
-    source /opt/pihole/basic-install.sh
+    source /usr/share/pi-hole/basic-install.sh
     create_pihole_user
     funcOutput=$(get_binary_name)
     binary="pihole-FTL${funcOutput##*pihole-FTL}"
@@ -756,7 +756,7 @@
     )
     detectPlatform = host.run(
         """
-    source /opt/pihole/basic-install.sh
+    source /usr/share/pi-hole/basic-install.sh
     create_pihole_user
     funcOutput=$(get_binary_name)
     binary="pihole-FTL${funcOutput##*pihole-FTL}"
@@ -791,7 +791,7 @@
     )
     detectPlatform = host.run(
         """
-    source /opt/pihole/basic-install.sh
+    source /usr/share/pi-hole/basic-install.sh
     create_pihole_user
     funcOutput=$(get_binary_name)
     binary="pihole-FTL${funcOutput##*pihole-FTL}"
@@ -813,7 +813,7 @@
     """
     detectPlatform = host.run(
         """
-    source /opt/pihole/basic-install.sh
+    source /usr/share/pi-hole/basic-install.sh
     create_pihole_user
     funcOutput=$(get_binary_name)
     binary="pihole-FTL${funcOutput##*pihole-FTL}"
@@ -835,7 +835,7 @@
     mock_command("uname", {"-m": ("mips", "0")}, host)
     detectPlatform = host.run(
         """
-    source /opt/pihole/basic-install.sh
+    source /usr/share/pi-hole/basic-install.sh
     create_pihole_user
     funcOutput=$(get_binary_name)
     binary="pihole-FTL${funcOutput##*pihole-FTL}"
@@ -855,14 +855,14 @@
     mock_command("dialog", {"*": ("", "0")}, host)
     host.run(
         """
-    source /opt/pihole/basic-install.sh
+    source /usr/share/pi-hole/basic-install.sh
     package_manager_detect
     install_dependent_packages ${INSTALLER_DEPS[@]}
     """
     )
     download_binary = host.run(
         """
-    source /opt/pihole/basic-install.sh
+    source /usr/share/pi-hole/basic-install.sh
     create_pihole_user
     FTLinstall "pihole-FTL-aarch64-linux-gnu"
     """
@@ -878,7 +878,7 @@
     """
     host.run(
         """
-    source /opt/pihole/basic-install.sh
+    source /usr/share/pi-hole/basic-install.sh
     create_pihole_user
     funcOutput=$(get_binary_name)
     echo "development" > /etc/pihole/ftlbranch
@@ -909,7 +909,7 @@
     )
     detectPlatform = host.run(
         """
-    source /opt/pihole/basic-install.sh
+    source /usr/share/pi-hole/basic-install.sh
     find_IPv6_information
     """
     )
@@ -934,7 +934,7 @@
     )
     detectPlatform = host.run(
         """
-    source /opt/pihole/basic-install.sh
+    source /usr/share/pi-hole/basic-install.sh
     find_IPv6_information
     """
     )
@@ -959,7 +959,7 @@
     )
     detectPlatform = host.run(
         """
-    source /opt/pihole/basic-install.sh
+    source /usr/share/pi-hole/basic-install.sh
     find_IPv6_information
     """
     )
@@ -985,7 +985,7 @@
     )
     detectPlatform = host.run(
         """
-    source /opt/pihole/basic-install.sh
+    source /usr/share/pi-hole/basic-install.sh
     find_IPv6_information
     """
     )
@@ -1011,7 +1011,7 @@
     )
     detectPlatform = host.run(
         """
-    source /opt/pihole/basic-install.sh
+    source /usr/share/pi-hole/basic-install.sh
     find_IPv6_information
     """
     )
@@ -1027,7 +1027,7 @@
     def test_address(addr, success=True):
         output = host.run(
             """
-        source /opt/pihole/basic-install.sh
+        source /usr/share/pi-hole/basic-install.sh
         valid_ip "{addr}"
         """.format(
                 addr=addr
@@ -1068,7 +1068,7 @@
     """Confirms install fails on unsupported OS"""
     host.run(
         """
-    source /opt/pihole/basic-install.sh
+    source /usr/share/pi-hole/basic-install.sh
     package_manager_detect
     install_dependent_packages ${OS_CHECK_DEPS[@]}
     install_dependent_packages ${INSTALLER_DEPS[@]}
@@ -1080,7 +1080,7 @@
     )
     detectOS = host.run(
         """t
-    source /opt/pihole/basic-install.sh
+    source /usr/share/pi-hole/basic-install.sh
     os_check
     """
     )
@@ -1092,7 +1092,7 @@
     """Confirms OS meets the requirements"""
     host.run(
         """
-    source /opt/pihole/basic-install.sh
+    source /usr/share/pi-hole/basic-install.sh
     package_manager_detect
     install_dependent_packages ${OS_CHECK_DEPS[@]}
     install_dependent_packages ${INSTALLER_DEPS[@]}
@@ -1100,7 +1100,7 @@
     )
     detectOS = host.run(
         """
-    source /opt/pihole/basic-install.sh
+    source /usr/share/pi-hole/basic-install.sh
     os_check
     """
     )
@@ -1113,7 +1113,7 @@
     mock_command("dialog", {"*": ("", "0")}, host)
     output = host.run(
         """
-    source /opt/pihole/basic-install.sh
+    source /usr/share/pi-hole/basic-install.sh
     package_manager_detect
     install_dependent_packages ${INSTALLER_DEPS[@]}
     """
@@ -1128,7 +1128,7 @@
     mock_command("dialog", {"*": ("", "0")}, host)
     output = host.run(
         """
-    source /opt/pihole/basic-install.sh
+    source /usr/share/pi-hole/basic-install.sh
     package_manager_detect
     install_dependent_packages ${PIHOLE_DEPS[@]}
     """
@@ -1143,7 +1143,7 @@
     mock_command("dialog", {"*": ("", "0")}, host)
     output = host.run(
         """
-    source /opt/pihole/basic-install.sh
+    source /usr/share/pi-hole/basic-install.sh
     package_manager_detect
     install_dependent_packages ${PIHOLE_WEB_DEPS[@]}
     """
diff -uNr pi-hole-5.16.1.orig/test/test_any_utils.py pi-hole-5.16.1/test/test_any_utils.py
--- pi-hole-5.16.1.orig/test/test_any_utils.py	2023-03-24 10:01:08.361453821 +0100
+++ pi-hole-5.16.1/test/test_any_utils.py	2023-03-24 10:01:27.212753242 +0100
@@ -2,7 +2,7 @@
     """Confirms addOrEditKeyValPair either adds or replaces a key value pair in a given file"""
     host.run(
         """
-    source /opt/pihole/utils.sh
+    source /usr/share/pi-hole/utils.sh
     addOrEditKeyValPair "./testoutput" "KEY_ONE" "value1"
     addOrEditKeyValPair "./testoutput" "KEY_TWO" "value2"
     addOrEditKeyValPair "./testoutput" "KEY_ONE" "value3"
@@ -22,7 +22,7 @@
     """Confirms addKey adds a key (no value) to a file without duplicating it"""
     host.run(
         """
-    source /opt/pihole/utils.sh
+    source /usr/share/pi-hole/utils.sh
     addKey "./testoutput" "KEY_ONE"
     addKey "./testoutput" "KEY_ONE"
     addKey "./testoutput" "KEY_TWO"
@@ -44,7 +44,7 @@
     """Confirms addKey adds substring keys (no value) to a file"""
     host.run(
         """
-    source /opt/pihole/utils.sh
+    source /usr/share/pi-hole/utils.sh
     addKey "./testoutput" "KEY_ONE"
     addKey "./testoutput" "KEY_O"
     addKey "./testoutput" "KEY_TWO"
@@ -64,7 +64,7 @@
     """Confirms removeKey removes a key or key/value pair"""
     host.run(
         """
-    source /opt/pihole/utils.sh
+    source /usr/share/pi-hole/utils.sh
     addOrEditKeyValPair "./testoutput" "KEY_ONE" "value1"
     addOrEditKeyValPair "./testoutput" "KEY_TWO" "value2"
     addOrEditKeyValPair "./testoutput" "KEY_THREE" "value3"
@@ -86,7 +86,7 @@
     """Confirms getFTLAPIPort returns the default API port"""
     output = host.run(
         """
-    source /opt/pihole/utils.sh
+    source /usr/share/pi-hole/utils.sh
     getFTLAPIPort
     """
     )
@@ -103,7 +103,7 @@
     )
     output = host.run(
         """
-    source /opt/pihole/utils.sh
+    source /usr/share/pi-hole/utils.sh
     getFTLAPIPort
     """
     )
@@ -120,7 +120,7 @@
     )
     output = host.run(
         """
-    source /opt/pihole/utils.sh
+    source /usr/share/pi-hole/utils.sh
     getFTLAPIPort
     """
     )
@@ -132,7 +132,7 @@
     """Confirms getFTLPIDFile returns the default PID file path"""
     output = host.run(
         """
-    source /opt/pihole/utils.sh
+    source /usr/share/pi-hole/utils.sh
     getFTLPIDFile
     """
     )
@@ -144,7 +144,7 @@
     """Confirms getFTLPID returns the default value if FTL is not running"""
     output = host.run(
         """
-    source /opt/pihole/utils.sh
+    source /usr/share/pi-hole/utils.sh
     getFTLPID
     """
     )
@@ -163,7 +163,7 @@
     )
     output = host.run(
         """
-    source /opt/pihole/utils.sh
+    source /usr/share/pi-hole/utils.sh
     FTL_PID_FILE=$(getFTLPIDFile)
     getFTLPID "${FTL_PID_FILE}"
     """
diff -uNr pi-hole-5.16.1.orig/test/test_centos_common_support.py pi-hole-5.16.1/test/test_centos_common_support.py
--- pi-hole-5.16.1.orig/test/test_centos_common_support.py	2023-03-24 10:01:08.361453821 +0100
+++ pi-hole-5.16.1/test/test_centos_common_support.py	2023-03-24 10:01:27.212753242 +0100
@@ -13,7 +13,7 @@
     """
     package_manager_detect = host.run(
         """
-    source /opt/pihole/basic-install.sh
+    source /usr/share/pi-hole/basic-install.sh
     package_manager_detect
     """
     )
diff -uNr pi-hole-5.16.1.orig/test/test_centos_fedora_common_support.py pi-hole-5.16.1/test/test_centos_fedora_common_support.py
--- pi-hole-5.16.1.orig/test/test_centos_fedora_common_support.py	2023-03-24 10:01:08.361453821 +0100
+++ pi-hole-5.16.1/test/test_centos_fedora_common_support.py	2023-03-24 10:01:27.213753258 +0100
@@ -32,7 +32,7 @@
     mock_selinux_config("enforcing", host)
     check_selinux = host.run(
         """
-    source /opt/pihole/basic-install.sh
+    source /usr/share/pi-hole/basic-install.sh
     checkSelinux
     """
     )
@@ -50,7 +50,7 @@
     mock_selinux_config("permissive", host)
     check_selinux = host.run(
         """
-    source /opt/pihole/basic-install.sh
+    source /usr/share/pi-hole/basic-install.sh
     checkSelinux
     """
     )
@@ -66,7 +66,7 @@
     mock_selinux_config("disabled", host)
     check_selinux = host.run(
         """
-    source /opt/pihole/basic-install.sh
+    source /usr/share/pi-hole/basic-install.sh
     checkSelinux
     """
     )
diff -uNr pi-hole-5.16.1.orig/test/test_fedora_support.py pi-hole-5.16.1/test/test_fedora_support.py
--- pi-hole-5.16.1.orig/test/test_fedora_support.py	2023-03-24 10:01:08.361453821 +0100
+++ pi-hole-5.16.1/test/test_fedora_support.py	2023-03-24 10:01:27.213753258 +0100
@@ -5,7 +5,7 @@
     """
     package_manager_detect = host.run(
         """
-    source /opt/pihole/basic-install.sh
+    source /usr/share/pi-hole/basic-install.sh
     package_manager_detect
     """
     )
diff -uNr pi-hole-5.16.1.orig/test/_ubuntu_20.Dockerfile pi-hole-5.16.1/test/_ubuntu_20.Dockerfile
--- pi-hole-5.16.1.orig/test/_ubuntu_20.Dockerfile	2023-03-24 10:01:08.360453804 +0100
+++ pi-hole-5.16.1/test/_ubuntu_20.Dockerfile	2023-03-24 10:01:27.212753242 +0100
@@ -1,7 +1,7 @@
 FROM buildpack-deps:focal-scm
 
 ENV GITDIR /etc/.pihole
-ENV SCRIPTDIR /opt/pihole
+ENV SCRIPTDIR /usr/share/pi-hole
 
 RUN mkdir -p $GITDIR $SCRIPTDIR /etc/pihole
 ADD . $GITDIR
@@ -15,4 +15,4 @@
 ENV SKIP_INSTALL true
 ENV OS_CHECK_DOMAIN_NAME dev-supportedos.pi-hole.net
 
-#sed '/# Start the installer/Q' /opt/pihole/basic-install.sh > /opt/pihole/stub_basic-install.sh && \
+#sed '/# Start the installer/Q' /usr/share/pi-hole/basic-install.sh > /usr/share/pi-hole/stub_basic-install.sh && \
diff -uNr pi-hole-5.16.1.orig/test/_ubuntu_22.Dockerfile pi-hole-5.16.1/test/_ubuntu_22.Dockerfile
--- pi-hole-5.16.1.orig/test/_ubuntu_22.Dockerfile	2023-03-24 10:01:08.360453804 +0100
+++ pi-hole-5.16.1/test/_ubuntu_22.Dockerfile	2023-03-24 10:01:27.212753242 +0100
@@ -1,7 +1,7 @@
 FROM buildpack-deps:jammy-scm
 
 ENV GITDIR /etc/.pihole
-ENV SCRIPTDIR /opt/pihole
+ENV SCRIPTDIR /usr/share/pi-hole
 
 RUN mkdir -p $GITDIR $SCRIPTDIR /etc/pihole
 ADD . $GITDIR
@@ -15,4 +15,4 @@
 ENV SKIP_INSTALL true
 ENV OS_CHECK_DOMAIN_NAME dev-supportedos.pi-hole.net
 
-#sed '/# Start the installer/Q' /opt/pihole/basic-install.sh > /opt/pihole/stub_basic-install.sh && \
+#sed '/# Start the installer/Q' /usr/share/pi-hole/basic-install.sh > /usr/share/pi-hole/stub_basic-install.sh && \

Places

File 001_pi-hole_move_to_datadir.patch of Package pi-hole (Revision 3d360b5b300f697c85fe9829e45ae6a0)

Places