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

Fixed issues that occur if WebAdmin not installed #165

Merged
merged 2 commits into from Feb 26, 2022
Merged

Fixed issues that occur if WebAdmin not installed #165

merged 2 commits into from Feb 26, 2022

Conversation

subnut
Copy link
Contributor

@subnut subnut commented Aug 13, 2021

  • Show the version as N/A (Not Available) instead of v-1
  • Don't show out-of-date message in status message

By submitting this pull request, I confirm the following:
please fill any appropriate checkboxes, e.g: [X]

  • I have read and understood the contributors guide, as well as this entire template.
  • I have made only one major change in my proposed changes.
  • I have commented my proposed changes within the code.
  • I have tested my proposed changes, and have included unit tests where possible.
  • I am willing to help maintain this change if there are issues with it later.
  • I give this submission freely and claim no ownership.
  • It is compatible with the EUPL 1.2 license
  • I have squashed any insignificant commits. (git rebase)

Please make sure you Sign Off all commits. Pi-hole enforces the DCO.


What does this PR aim to accomplish?:
Fix the errors mentioned in the Commit Message. The errors occur only when Web Interface not installed.

How does this PR accomplish the above?:
Checks if web interface installed. If not, sets version to 'N/A' instead of v-1

What documentation changes (if any) are needed to support this PR?:
None


  • You must follow the template instructions. Failure to do so will result in your pull request being closed.
  • Please respect that Pi-hole is developed by volunteers, who can only reply in their spare time.

@subnut
Copy link
Contributor Author

subnut commented Aug 15, 2021

Ping @DL6ER @dschaper

@subnut subnut changed the title Fixed issues that occur if Web Interface unavailable Fixed issues that occur if WebAdmin not installed Aug 15, 2021
@subnut
Copy link
Contributor Author

subnut commented Feb 26, 2022

Rebased on master

- Show the version as N/A (Not Available) instead of v-1
- Don't show out-of-date message in status message
@subnut
Copy link
Contributor Author

subnut commented Feb 26, 2022

Fixed Stickler errors

@yubiuser yubiuser changed the base branch from master to development February 26, 2022 05:59
Copy link
Member

@yubiuser yubiuser left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We already source setupVars.conf twice, I think we don't need it a third time:

PADD/padd.sh

Line 1249 in 8558356

. /etc/pihole/setupVars.conf

PADD/padd.sh

Line 1192 in 8558356

. /etc/pihole/setupVars.conf

(One can probably be removed).

@subnut
Copy link
Contributor Author

subnut commented Feb 26, 2022

We wouldn't have needed to source that file if it was guaranteed that the file has been sourced already (ie. source it in the main script, not inside any function or if block).

Should I go ahead and do that? (i.e. add . /etc/pihole/setupVars.conf to line 28, and remove from everywhere else)

@yubiuser
Copy link
Member

Should I go ahead and do that? (i.e. add . /etc/pihole/setupVars.conf to line 28, and remove from everywhere else)

I think this is a good idea.

@subnut
Copy link
Contributor Author

subnut commented Feb 26, 2022

@yubiuser Done!

@yubiuser yubiuser merged commit 2c31f6a into pi-hole:development Feb 26, 2022
@subnut subnut deleted the web-interface-not-installed branch February 27, 2022 03:16
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.

None yet

2 participants