Compare commits
10 Commits
v6.1.3
..
95021fce58
| Author | SHA1 | Date | |
|---|---|---|---|
| 95021fce58 | |||
| ae048201a2 | |||
| dad27f8d06 | |||
| c0b512be60 | |||
| cef7fd4b02 | |||
| c09da77e2b | |||
| 18e8396a44 | |||
| 1bef0415db | |||
| d6a83baf4f | |||
| 605ff8183a |
@@ -9,12 +9,12 @@
|
|||||||
# This file is copyright under the latest version of the EUPL.
|
# This file is copyright under the latest version of the EUPL.
|
||||||
# Please see LICENSE file for your rights under this license.
|
# Please see LICENSE file for your rights under this license.
|
||||||
|
|
||||||
readonly PI_HOLE_SCRIPT_DIR="/opt/pihole"
|
PI_HOLE_SCRIPT_DIR="/opt/pihole"
|
||||||
readonly utilsfile="${PI_HOLE_SCRIPT_DIR}/utils.sh"
|
utilsfile="${PI_HOLE_SCRIPT_DIR}/utils.sh"
|
||||||
# shellcheck source="./advanced/Scripts/utils.sh"
|
# shellcheck source="./advanced/Scripts/utils.sh"
|
||||||
source "${utilsfile}"
|
source "${utilsfile}"
|
||||||
|
|
||||||
readonly apifile="${PI_HOLE_SCRIPT_DIR}/api.sh"
|
apifile="${PI_HOLE_SCRIPT_DIR}/api.sh"
|
||||||
# shellcheck source="./advanced/Scripts/api.sh"
|
# shellcheck source="./advanced/Scripts/api.sh"
|
||||||
source "${apifile}"
|
source "${apifile}"
|
||||||
|
|
||||||
|
|||||||
@@ -808,6 +808,10 @@ gravity_DownloadBlocklistFromUrl() {
|
|||||||
fix_owner_permissions "${saveLocation}"
|
fix_owner_permissions "${saveLocation}"
|
||||||
# Compare lists if they are identical
|
# Compare lists if they are identical
|
||||||
compareLists "${adlistID}" "${saveLocation}"
|
compareLists "${adlistID}" "${saveLocation}"
|
||||||
|
# Set permissions for the *.etag file
|
||||||
|
if [[ -f "${saveLocation}.etag" ]]; then
|
||||||
|
fix_owner_permissions "${saveLocation}.etag"
|
||||||
|
fi
|
||||||
# Add domains to database table file
|
# Add domains to database table file
|
||||||
pihole-FTL "${gravity_type}" parseList "${saveLocation}" "${gravityTEMPfile}" "${adlistID}"
|
pihole-FTL "${gravity_type}" parseList "${saveLocation}" "${gravityTEMPfile}" "${adlistID}"
|
||||||
done="true"
|
done="true"
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
# This file is copyright under the latest version of the EUPL.
|
# This file is copyright under the latest version of the EUPL.
|
||||||
# Please see LICENSE file for your rights under this license.
|
# Please see LICENSE file for your rights under this license.
|
||||||
|
|
||||||
readonly PI_HOLE_SCRIPT_DIR="/opt/pihole"
|
PI_HOLE_SCRIPT_DIR="/opt/pihole"
|
||||||
|
|
||||||
# PI_HOLE_BIN_DIR is not readonly here because in some functions (checkout),
|
# PI_HOLE_BIN_DIR is not readonly here because in some functions (checkout),
|
||||||
# they might get set again when the installer is sourced. This causes an
|
# they might get set again when the installer is sourced. This causes an
|
||||||
@@ -20,7 +20,7 @@ readonly colfile="${PI_HOLE_SCRIPT_DIR}/COL_TABLE"
|
|||||||
# shellcheck source=./advanced/Scripts/COL_TABLE
|
# shellcheck source=./advanced/Scripts/COL_TABLE
|
||||||
source "${colfile}"
|
source "${colfile}"
|
||||||
|
|
||||||
readonly utilsfile="${PI_HOLE_SCRIPT_DIR}/utils.sh"
|
utilsfile="${PI_HOLE_SCRIPT_DIR}/utils.sh"
|
||||||
# shellcheck source=./advanced/Scripts/utils.sh
|
# shellcheck source=./advanced/Scripts/utils.sh
|
||||||
source "${utilsfile}"
|
source "${utilsfile}"
|
||||||
|
|
||||||
@@ -552,7 +552,7 @@ case "${1}" in
|
|||||||
"enable" ) need_root=0;;
|
"enable" ) need_root=0;;
|
||||||
"disable" ) need_root=0;;
|
"disable" ) need_root=0;;
|
||||||
"-d" | "debug" ) ;;
|
"-d" | "debug" ) ;;
|
||||||
"-g" | "updateGravity" ) ;;
|
"-g" | "updateGravity" ) need_root=0;;
|
||||||
"reloaddns" ) ;;
|
"reloaddns" ) ;;
|
||||||
"reloadlists" ) ;;
|
"reloadlists" ) ;;
|
||||||
"setpassword" ) ;;
|
"setpassword" ) ;;
|
||||||
|
|||||||
Reference in New Issue
Block a user