From 6305464645c70dc98533efce4d85194620e6a575 Mon Sep 17 00:00:00 2001 From: Viacheslav Hletenko Date: Wed, 4 Oct 2023 08:46:42 +0000 Subject: T5632: Add user-util jq to parse JSON files from sh Add useful tool "jq" to parse JSON files from sh scripts. echo '{"system": "VyOS", "rate": 100}' | jq '.system' "VyOS" (cherry picked from commit eb272121fce945381304ff8f233d3b054eda6f46) # Conflicts: # debian/control --- debian/control | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'debian/control') diff --git a/debian/control b/debian/control index f92edbf..4640e15 100644 --- a/debian/control +++ b/debian/control @@ -18,7 +18,11 @@ Depends: iftop, iotop, irqtop, +<<<<<<< HEAD ipcalc, +======= + jq, +>>>>>>> eb27212 (T5632: Add user-util jq to parse JSON files from sh) libnss-myhostname, lsof, localepurge, -- cgit v1.2.3 From 78f90360a106b89d263334a2b18f8c9fbd9c14dd Mon Sep 17 00:00:00 2001 From: Viacheslav Hletenko Date: Wed, 4 Oct 2023 14:16:20 +0300 Subject: T5632: Fix conflicts after backport jq Mergify tried to backport #7 to equuleus but there were some conflicts --- debian/control | 3 --- 1 file changed, 3 deletions(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 4640e15..2bdb441 100644 --- a/debian/control +++ b/debian/control @@ -18,11 +18,8 @@ Depends: iftop, iotop, irqtop, -<<<<<<< HEAD ipcalc, -======= jq, ->>>>>>> eb27212 (T5632: Add user-util jq to parse JSON files from sh) libnss-myhostname, lsof, localepurge, -- cgit v1.2.3