Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow for empty strings to be passed into FTLCONF_ environment variables #1288

Merged
merged 1 commit into from
Jan 20, 2023

Conversation

PromoFaux
Copy link
Member

What does this PR aim to accomplish?:

In order to set FTL's DBFILE value to empty, one has to pass in the variable as in as FTLCONF_DBFILE: "", however this was parsed wrong by the sed command which was expected one or more chars between the "s.

See https://discourse.pi-hole.net/t/installing-a-pi-hole-while-reducing-the-writing-on-the-sd-card/60519/11?u=promofaux

This fixes it by allowing the value between "s to also be empty


By submitting this pull request, I confirm the following:

  1. I have read and understood the contributors guide, as well as this entire template. I understand which branch to base my commits and Pull Requests against.
  2. I have commented my proposed changes within the code and I have tested my changes.
  3. I am willing to help maintain this change if there are issues with it later.
  4. It is compatible with the EUPL 1.2 license
  5. I have squashed any insignificant commits. (git rebase)

  • I have read the above and my PR is ready for review. Check this box to confirm

…les.

Signed-off-by: Adam Warner <me@adamwarner.co.uk>
@PromoFaux PromoFaux merged commit 52ee954 into dev Jan 20, 2023
@PromoFaux PromoFaux deleted the allow_empty_ftconf branch January 20, 2023 18:26
@sonarcloud
Copy link

sonarcloud bot commented Jan 20, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant