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.

Sign up for GitHub

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

Jump to bottom

Tweaks to os_check() Redux #3688

Merged
merged 3 commits into from
Aug 17, 2020
Merged

Tweaks to os_check() Redux #3688

merged 3 commits into from
Aug 17, 2020

Conversation

dschaper
Copy link
Member

A few tweaks to the os-check function.

Reduce subshell use where possible.
Use descriptive variable names.
Remove boolean variables. Bash doesn't have booleans, they are just strings.
Check using /etc/os-release since all supported distro's use that file.

See #3864 for detail.

@dschaper
Use fewer subshells and descriptive variables.
57e65dd 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
@dschaper dschaper marked this pull request as draft August 14, 2020 21:30
@dschaper
Tabs and debug.sh
623ce1f 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
@dschaper dschaper added this to the v5.2 milestone Aug 14, 2020
@dschaper dschaper marked this pull request as ready for review August 14, 2020 21:41
@dschaper
display_warning fixes
ebdb68a 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
@dschaper dschaper mentioned this pull request Aug 17, 2020
Closed
@PromoFaux PromoFaux mentioned this pull request Aug 17, 2020
Closed
@PromoFaux PromoFaux self-requested a review August 17, 2020 16:31
@PromoFaux PromoFaux merged commit 42f55f5 into development Aug 17, 2020
@PromoFaux PromoFaux deleted the tweak/os-check branch August 17, 2020 16:32
@pralor-bot
Copy link

This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there:

https://discourse.pi-hole.net/t/pi-hole-core-web-v5-2-and-ftl-v5-3-released/40909/1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PromoFaux PromoFaux PromoFaux approved these changes

@yubiuser yubiuser yubiuser approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v5.2
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@dschaper @pralor-bot @PromoFaux @yubiuser