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

Add jq as dependency and remove json_extract #4878

Merged
merged 2 commits into from
Aug 26, 2022
Merged

Add jq as dependency and remove json_extract #4878

merged 2 commits into from
Aug 26, 2022

Conversation

yubiuser
Copy link
Member

@yubiuser yubiuser commented Aug 24, 2022

What does this PR aim to accomplish?:

Adds jq as dependency and removes the now obsolete json_extract function.
jq is a small dependency and adds powerfull json abilities. With FTL v6 we will have a whole new json-based API where jq might be needed anyway. Also for PADD to interact with FTL v6, jq will be a requirement: pi-hole/PADD#247


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

@yubiuser yubiuser requested a review from a team August 24, 2022 19:48
@yubiuser yubiuser added the PR: Approval Required Open Pull Request, needs approval label Aug 24, 2022
@yubiuser
Copy link
Member Author

Example

curl -s 'https://api.github.com/repos/pi-hole/pi-hole/releases/latest' 2> /dev/null | jq --raw-output .tag_name
v5.11.4

@yubiuser yubiuser changed the title Jq Add jq as dependency and remove json_extract Aug 24, 2022
dschaper
dschaper previously approved these changes Aug 24, 2022
Signed-off-by: Christian König <ckoenig@posteo.de>
Signed-off-by: Christian König <ckoenig@posteo.de>
@yubiuser
Copy link
Member Author

Needs re-approval, needed to FP to sign all commits.

@yubiuser yubiuser requested a review from dschaper August 25, 2022 20:22
@yubiuser yubiuser merged commit d6cfa57 into development Aug 26, 2022
@yubiuser yubiuser deleted the jq branch August 26, 2022 08:09
@RSickenberg
Copy link

Did you tested this on a raspbian bullseye ?

I cannot install it bc apparently the version is not available. https://discourse.pi-hole.net/t/opt-pihole-updatecheck-sh-line-47-jq-command-not-found/57789

@yubiuser
Copy link
Member Author

Yes, all installer dependencies are automatically tested in our test suite:
https://github.com/pi-hole/pi-hole/runs/8011149481?check_suite_focus=true

@RSickenberg
Copy link

@yubiuser Ok, it appears it was linked to raspbian bulleyes repo, If I changed the sources to buster it all went ok.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
PR: Approval Required Open Pull Request, needs approval
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants