Huge tidy up/prune/refactor of the code #1141
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Moves most code in start.sh into functions in bash_functions.sh - Removes code from 20-start.sh and moves it inside start.sh - Removes unused variables and code, making it easier to find our way around - Removes dependency on webpage.sh, which had to be modified in order to source it properly (thus breaking pihole checkout), use utils.sh instead - Replaces all uses of ServerIP/v6 with new FTLCONF_REPLY_ADDR4/6 variables - No need to symlink echo to whiptail any more (probably hasn't been needed for a while) - removes huge list of exported env vars at the top of start.sh - no longer appear to be needed - rename some functions in bash_functions to more logical names, group their usages in start.sh - adjust/fix tests to match changes - remove some dead tests Signed-off-by: Adam Warner <[email protected]>
Signed-off-by: Adam Warner <[email protected]>
Signed-off-by: Adam Warner <[email protected]>
…o get away from this without a dedicated function in the core repo (or copying the code - but I wont do that) Signed-off-by: Adam Warner <[email protected]>
…ipt. Prevents issues when checking out a new branch of pihole-FTL inside the container Signed-off-by: Adam Warner <[email protected]>
Upgrade to S6 overlay v3
Build this branch on push? Signed-off-by: Adam Warner <[email protected]>
Signed-off-by: Adam Warner <[email protected]>
PromoFaux
force-pushed
the
massive-refactor
branch
from
14699fc to
f62392a
Compare
Signed-off-by: Adam Warner <[email protected]>
PromoFaux
force-pushed
the
massive-refactor
branch
from
f62392a to
eb5c86e
Compare
rdwebdesign
reviewed
Jul 14, 2022
Co-authored-by: RD WebDesign <[email protected]> Signed-off-by: Adam Warner <[email protected]>
|
Kudos, SonarCloud Quality Gate passed!
|
6 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
A lot of changes here - but this has been a long time coming, and is desperately needed. Tested functionality as I went along, everything appears to be in order.
Summary of changes: