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

Fix check if FTL is running #304

Merged
merged 1 commit into from
Dec 18, 2022
Merged

Fix check if FTL is running #304

merged 1 commit into from
Dec 18, 2022

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Dec 18, 2022

What does this PR aim to accomplish?:

Fix #303

How does this PR accomplish the above?:

The currently used test is broken:

if [ -z ${ftlPID+x} ]; then

will always succeed as +x will substitute the variable by x if the variable is set.

As we have

ftlPID=$(pidof pihole-FTL)

above, the variable will never be unset. However, when FTL ist not running and the variable is empty, the substitution will kick in and the test will still succeed (although it obviously shouldn't). This test is simply wrong.

The test should read

if [ -z "${ftlPID}" ]; then

instead.

Link documentation PRs if any are needed to support this PR:

N/A


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)
  6. I have checked that another pull request for this purpose does not exist.
  7. I have considered, and confirmed that this submission will be valuable to others.
  8. I accept that this submission may not be used, and the pull request closed at the will of the maintainer.
  9. I give this submission freely, and claim no ownership to its content.

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

@yubiuser yubiuser merged commit 0520a95 into development Dec 18, 2022
@yubiuser yubiuser deleted the fix/ps_test branch December 18, 2022 07:07
This was referenced Dec 18, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants