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

Simplify pihole -v #5517

Merged
merged 3 commits into from
Dec 9, 2023
Merged

Simplify pihole -v #5517

merged 3 commits into from
Dec 9, 2023

Conversation

yubiuser
Copy link
Member

@yubiuser yubiuser commented Dec 9, 2023

What does this PR aim to accomplish?:

Simplify pihole -v by removing the ability to request every detail on its own.
Today pihole -v is mainly a wrapper for cat /etc/pihole/versions. There is no need to request every piece of information separately.
This PR will show basic version information with pihole -v which is suitable for approx. 95% of users running on master branch. A new option pihole -vv prints detailed information if necessary.

nanopi@nanopi:~$ pihole -v
Core version is v5.17.1-247-g4c35110 (Latest: v5.17.2)
Web version is v5.19-615-gc548aebe (Latest: v5.21)
FTL version is vDev-2b2ab3f (Latest: v5.23)

nanopi@nanopi:~$ pihole -vv
Core
    Version is v5.17.1-247-g4c35110 (Latest: v5.17.2)
    Branch is tweak/version
    Hash is 4c351103 (Latest: 4c351103)
Web
    Version is v5.19-615-gc548aebe (Latest: v5.21)
    Branch is dependabot/npm_and_yarn/development-v6/jquery-3.7.1
    Hash is c548aebe (Latest: c548aebe)
FTL
    Version is vDev-2b2ab3f (Latest: v5.23)
    Branch is development-v6
    Hash is 2b2ab3f5 (Latest: 2b2ab3f5)
nanopi@nanopi:~$ 


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 requested a review from a team December 9, 2023 21:55
@DL6ER
Copy link
Member

DL6ER commented Dec 9, 2023

How about switching to -vv automatically if one of the branches is != master ?

@github-actions github-actions bot added the PR: Merge Conflict Issue blocking check and merge of code label Dec 9, 2023
Copy link

github-actions bot commented Dec 9, 2023

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Signed-off-by: Christian König <ckoenig@posteo.de>
Signed-off-by: Christian König <ckoenig@posteo.de>
Signed-off-by: Christian König <ckoenig@posteo.de>
@github-actions github-actions bot removed the PR: Merge Conflict Issue blocking check and merge of code label Dec 9, 2023
Copy link

github-actions bot commented Dec 9, 2023

Conflicts have been resolved.

Copy link
Member

@DL6ER DL6ER left a comment

Choose a reason for hiding this comment

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

$ pihole -v
Core
    Version is v5.17.1-256-gc3c31a1a (Latest: v5.17.2)
    Branch is tweak/version
    Hash is c3c31a1a (Latest: c3c31a1a)
Web
    Version is v5.19-602-g854a99d4 (Latest: v5.21)
    Branch is tweak/save_button
    Hash is 854a99d4 (Latest: N/A)
FTL
    Version is v5.23-1403-gd6f13ac7 (Latest: v5.23)
    Branch is development-v6
    Hash is d6f13ac7 (Latest: d6f13ac7)

@yubiuser yubiuser merged commit 13676c4 into development-v6 Dec 9, 2023
15 checks passed
@yubiuser yubiuser deleted the tweak/version branch December 9, 2023 22:21
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.

None yet

2 participants