Update update.sh, updatecheck.sh and uninstall.sh to honour pihole.to… #5981
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
…ml settings for webserver.paths.webroot and webserver.paths.webhome
What does this PR aim to accomplish?:
Attempt to address #5980
How does this PR accomplish the above?:
Update
advanced/Scripts/update.sh
to sourceutils.sh
and build theADMIN_INTERFACE_DIR
variable from configuration inpihole.toml
via thegetFTLConfigValue()
function. Also change a hard coded reference of/var/www/html/admin
in output string to use theADMIN_INTERFACE_DIR
variable.Update
advanced/Scripts/updatecheck.sh
to build anADMIN_INTERFACE_DIR
variable from configuration inpihole.toml
via thegetFTLConfigValue()
function and change hard coded references to/var/www/html/admin
to use the addedADMIN_INTERFACE_DIR
variable.Update
automated install/uninstall.sh
to sourceutils.sh
and to build anADMIN_INTERFACE_DIR
variable from configuration inpihole.toml
via thegetFTLConfigValue()
function. Add a check that if web UI path is not the default of/var/www/html/admin
do not automatically delete the custom path, but tell user to delete manually. This is a bit of a work around to deal with potentially "unsafe" paths getting pulled frompihole.toml
(and its a custom config, so possibly a fair ask).By submitting this pull request, I confirm the following:
git rebase
)