Skip to content

Commit

Permalink
Update website
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] committed Jan 8, 2024
1 parent 8d393de commit 2da5f72
Show file tree
Hide file tree
Showing 6 changed files with 47 additions and 76 deletions.
35 changes: 30 additions & 5 deletions download/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,13 @@ <h1>Download jq</h1>
<p>jq is licensed under the MIT license. For all of the gory
details, read the file <code>COPYING</code> in the source distribution.</p>
<p>jq uses a C library for decimal number support. This is an ICU 1.8.1
licensed code obtained from the ICU downloads archive
http://download.icu-project.org/files/decNumber/decNumber-icu-368.zip.</p>
licensed code obtained from the ICU downloads archive.<br />
<a href="https://download.icu-project.org/files/decNumber/decNumber-icu-368.zip">https://download.icu-project.org/files/decNumber/decNumber-icu-368.zip</a></p>
<h3>Linux</h3>
<ul>
<li>
<p>jq is in the official <a href="https://packages.debian.org/jq">Debian</a> and
<a href="http://packages.ubuntu.com/jq">Ubuntu</a> repositories. Install using
<a href="https://packages.ubuntu.com/jq">Ubuntu</a> repositories. Install using
<code>sudo apt-get install jq</code>.</p>
</li>
<li>
Expand All @@ -87,6 +87,14 @@ <h3>Linux</h3>
Install using <code>sudo pacman -S jq</code>.</p>
</li>
<li>
<p>jq 1.7.1 binaries for
<a href="https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux-amd64">AMD64</a>
or
<a href="https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux-arm64">ARM64</a>
or
<a href="https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux-i386">i386</a>.</p>
</li>
<li>
<p>jq 1.7 binaries for
<a href="https://github.com/jqlang/jq/releases/download/jq-1.7/jq-linux-amd64">AMD64</a>
or
Expand Down Expand Up @@ -122,7 +130,7 @@ <h3>Linux</h3>
<h3>macOS</h3>
<ul>
<li>
<p>Use <a href="http://brew.sh/">Homebrew</a> to install jq with <code>brew install jq</code>.</p>
<p>Use <a href="https://brew.sh/">Homebrew</a> to install jq with <code>brew install jq</code>.</p>
</li>
<li>
<p>Use <a href="https://www.macports.org">MacPorts</a> to install jq with <code>port install jq</code>.</p>
Expand All @@ -131,6 +139,12 @@ <h3>macOS</h3>
<p>Use <a href="https://finkproject.org">Fink</a> to install jq with <code>fink install jq</code>.</p>
</li>
<li>
<p>jq 1.7.1 binaries for
<a href="https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-macos-amd64">AMD64</a>
or
<a href="https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-macos-arm64">ARM64</a>.</p>
</li>
<li>
<p>jq 1.7 binaries for
<a href="https://github.com/jqlang/jq/releases/download/jq-1.7/jq-macos-amd64">AMD64</a>
or
Expand Down Expand Up @@ -197,6 +211,12 @@ <h3>Windows</h3>
<code>chocolatey install jq</code>.</p>
</li>
<li>
<p>jq 1.7.1 executables for
<a href="https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-windows-amd64.exe">AMD64</a>
or
<a href="https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-windows-i386.exe">i386</a>.</p>
</li>
<li>
<p>jq 1.7 executables for
<a href="https://github.com/jqlang/jq/releases/download/jq-1.7/jq-windows-amd64.exe">AMD64</a>
or
Expand Down Expand Up @@ -231,6 +251,8 @@ <h3>Checksums and signatures</h3>
<p>SHA-256 checksums are provided for all release and pre-release binaries.
They can be found under
<a href="https://github.com/jqlang/jq/tree/master/sig">sig/v1.x/sha256sum.txt</a>.
The checksums for jq 1.7.1 are in
<a href="https://raw.githubusercontent.com/jqlang/jq/master/sig/v1.7.1/sha256sum.txt">sig/v1.7.1/sha256sum.txt</a>.
The checksums for jq 1.7 are in
<a href="https://raw.githubusercontent.com/jqlang/jq/master/sig/v1.7/sha256sum.txt">sig/v1.7/sha256sum.txt</a>.
The checksums for jq 1.6 are in
Expand All @@ -240,6 +262,8 @@ <h3>Checksums and signatures</h3>
<p>Additionally, all release artifacts are signed by a jq release key. We have two release keys, <a href="https://raw.githubusercontent.com/jqlang/jq/master/sig/jq-release-old.key">one for 1.6 and older releases</a>, and <a href="https://raw.githubusercontent.com/jqlang/jq/master/sig/jq-release-new.key">one for 1.7 and newer releases</a>.
Signatures can be found under
<a href="https://github.com/jqlang/jq/tree/master/sig">sig/v1.x/*.asc</a>.
The signatures for jq 1.7.1 are in
<a href="https://github.com/jqlang/jq/tree/master/sig/v1.7.1">sig/v1.7.1/*.asc</a>.
The signatures for jq 1.7 are in
<a href="https://github.com/jqlang/jq/tree/master/sig/v1.7">sig/v1.7/*.asc</a>.
The signatures for jq 1.6 are in
Expand All @@ -250,6 +274,7 @@ <h3>Checksums and signatures</h3>
the signature and running <code>gpg --verify signature.asc</code>.</p>
<h3>From source on Linux, macOS, Cygwin, and other POSIX-like operating systems</h3>
<ul>
<li><a href="https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-1.7.1.tar.gz">Source tarball for jq 1.7.1</a></li>
<li><a href="https://github.com/jqlang/jq/releases/download/jq-1.7/jq-1.7.tar.gz">Source tarball for jq 1.7</a></li>
<li><a href="https://github.com/jqlang/jq/releases/download/jq-1.6/jq-1.6.tar.gz">Source tarball for jq 1.6</a></li>
<li><a href="https://github.com/jqlang/jq/releases/download/jq-1.5/jq-1.5.tar.gz">Source tarball for jq 1.5</a></li>
Expand Down Expand Up @@ -277,7 +302,7 @@ <h3>From source on Linux, macOS, Cygwin, and other POSIX-like operating systems<
<p>On macOS, these are all included in Apple's command line tools, which can
be installed from <a href="https://developer.apple.com/xcode/">Xcode</a>. However,
you may find that you need a newer version of Bison than the one provided
by Apple. This can be found in <a href="http://brew.sh">Homebrew</a> or
by Apple. This can be found in <a href="https://brew.sh/">Homebrew</a> or
<a href="https://macports.org/">MacPorts</a>.</p>
<p>If you want to generate the lexer and parser from source you can use the
<code>--enable-maintainer-mode</code> configure flag. This requires bison to be installed.
Expand Down
17 changes: 11 additions & 6 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -66,15 +66,15 @@ <h2 class="px-1" style="width:16em">
</h2>
<div class="btn-group d-print-none" role="group">
<button type="button" class="btn btn-primary dropdown-toggle text-nowrap" data-bs-toggle="dropdown" aria-expanded="false">
Download jq 1.7
Download jq 1.7.1
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
<li><a class="dropdown-item" href="https://github.com/jqlang/jq/releases/download/jq-1.7/jq-linux-amd64" aria-label="Link to download executable: Linux (AMD64)"><span class="bi bi-download me-2" aria-hidden="true"></span>Linux (AMD64)</a></li>
<li><a class="dropdown-item" href="https://github.com/jqlang/jq/releases/download/jq-1.7/jq-linux-arm64" aria-label="Link to download executable: Linux (ARM64)"><span class="bi bi-download me-2" aria-hidden="true"></span>Linux (ARM64)</a></li>
<li><a class="dropdown-item" href="https://github.com/jqlang/jq/releases/download/jq-1.7/jq-macos-amd64" aria-label="Link to download executable: macOS (AMD64)"><span class="bi bi-download me-2" aria-hidden="true"></span>macOS (AMD64)</a></li>
<li><a class="dropdown-item" href="https://github.com/jqlang/jq/releases/download/jq-1.7/jq-macos-arm64" aria-label="Link to download executable: macOS (ARM64)"><span class="bi bi-download me-2" aria-hidden="true"></span>macOS (ARM64)</a></li>
<li><a class="dropdown-item" href="https://github.com/jqlang/jq/releases/download/jq-1.7/jq-windows-amd64.exe" aria-label="Link to download executable: Windows (AMD64)"><span class="bi bi-download me-2" aria-hidden="true"></span>Windows (AMD64)</a></li>
<li><a class="dropdown-item" href="https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux-amd64" aria-label="Link to download executable: Linux (AMD64)"><span class="bi bi-download me-2" aria-hidden="true"></span>Linux (AMD64)</a></li>
<li><a class="dropdown-item" href="https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux-arm64" aria-label="Link to download executable: Linux (ARM64)"><span class="bi bi-download me-2" aria-hidden="true"></span>Linux (ARM64)</a></li>
<li><a class="dropdown-item" href="https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-macos-amd64" aria-label="Link to download executable: macOS (AMD64)"><span class="bi bi-download me-2" aria-hidden="true"></span>macOS (AMD64)</a></li>
<li><a class="dropdown-item" href="https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-macos-arm64" aria-label="Link to download executable: macOS (ARM64)"><span class="bi bi-download me-2" aria-hidden="true"></span>macOS (ARM64)</a></li>
<li><a class="dropdown-item" href="https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-windows-amd64.exe" aria-label="Link to download executable: Windows (AMD64)"><span class="bi bi-download me-2" aria-hidden="true"></span>Windows (AMD64)</a></li>
<li><a class="dropdown-item" href="/jq/download/">Other platforms, older versions, and source</a></li>
</ul>
<a class="btn btn-primary text-nowrap" href="https://jqplay.org" target="_blank" rel="noopener">
Expand Down Expand Up @@ -106,6 +106,11 @@ <h2 class="px-1" style="width:16em">

<h2>News</h2>
<ul>
<li>
<span class="fst-italic">13 December 2023</span>
<p>jq 1.7.1 released. Security (CVE-2023-50246, CVE-2023-50268) and bug fixes.
See <a href="https://github.com/jqlang/jq/releases/tag/jq-1.7.1">release notes</a> for details.</p>
</li>
<li>
<span class="fst-italic">7 September 2023</span>
<p>After a five-year hiatus, we've returned with a revitalized <a href="https://github.com/jqlang">GitHub organization</a>
Expand Down
65 changes: 3 additions & 62 deletions manual/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,6 @@ <h4>Contents</h4>
<li class="nav-item" data-bs-dismiss="offcanvas" data-bs-target="#contents">
<a class="nav-link" href="#assignment">Assignment</a>
</li>
<li class="nav-item" data-bs-dismiss="offcanvas" data-bs-target="#contents">
<a class="nav-link" href="#comments">Comments</a>
</li>
<li class="nav-item" data-bs-dismiss="offcanvas" data-bs-target="#contents">
<a class="nav-link" href="#modules">Modules</a>
</li>
Expand Down Expand Up @@ -293,7 +290,7 @@ <h2>Invoking jq <a href="#invoking-jq" class="icon-link" aria-label="Link to thi
<li><code>-f filename</code> / <code>--from-file filename</code>:</li>
</ul>
<p>Read filter from the file rather than from a command line, like
awk's -f option.</p>
awk's -f option. You can also use '#' to make comments.</p>
<ul>
<li><code>-L directory</code>:</li>
</ul>
Expand Down Expand Up @@ -5821,7 +5818,7 @@ <h3>
<a href="#alternative-operator" class="icon-link" aria-label="Link to this section: Alternative operator: `//`"><span class="bi bi-link-45deg" aria-hidden="true"></span></a>
</h3>
<p>The <code>//</code> operator produces all the values of its left-hand
side that are neither <code>false</code> nor <code>null</code>, or, if the
side that are neither <code>false</code> nor <code>null</code>. If the
left-hand side produces no values other than <code>false</code> or
<code>null</code>, then <code>//</code> produces all the values of its right-hand
side.</p>
Expand Down Expand Up @@ -6043,7 +6040,7 @@ <h3>
<pre><code>label $out | ... break $out ...
</code></pre>
<p>The <code>break $label_name</code> expression will cause the program to
to act as though the nearest (to the left) <code>label $label_name</code>
act as though the nearest (to the left) <code>label $label_name</code>
produced <code>empty</code>.</p>
<p>The relationship between the <code>break</code> and corresponding <code>label</code>
is lexical: the label has to be "visible" from the break.</p>
Expand Down Expand Up @@ -7989,61 +7986,6 @@ <h3>
</code></pre>
</section>
</section>
<section id="comments">
<h2>Comments <a href="#comments" class="icon-link" aria-label="Link to this section: Comments"><span class="bi bi-link-45deg" aria-hidden="true"></span></a></h2>
<p>You can write comments in your jq filters using <code>#</code>.</p>
<p>A <code>#</code> character (not part of a string) starts a comment.
All characters from <code>#</code> to the end of the line are ignored.</p>
<p>If the end of the line is preceded by an odd number of backslash
characters, the following line is also considered part of the
comment and is ignored.</p>
<p>For example, the following code outputs <code>[1,3,4,7]</code></p>
<pre><code>[
1,
# foo \
2,
# bar \\
3,
4, # baz \\\
5, \
6,
7
# comment \
comment \
comment
]
</code></pre>
<p>Backslash continuing the comment on the next line can be useful
when writing the "shebang" for a jq script:</p>
<pre><code>#!/bin/sh --
# sum - Output the sum of the given arguments (or stdin)
# usage: sum [numbers...]
# \
exec jq --args -MRnf "$0" -- "$@"

$ARGS.positional |
reduce (
if . == []
then inputs
else .[]
end |
. as $dot |
try tonumber catch false |
if not or isnan then
@json "sum: Invalid number \($dot).\n" | halt_error(1)
end
) as $n (0; . + $n)
</code></pre>
<p>The <code>exec</code> line is considered a comment by jq, so it is ignored.
But it is not ignored by <code>sh</code>, since in <code>sh</code> a backslash at the
end of the line does not continue the comment.
With this trick, when the script is invoked as <code>sum 1 2</code>,
<code>/bin/sh -- /path/to/sum 1 2</code> will be run, and <code>sh</code> will then
run <code>exec jq --args -MRnf /path/to/sum -- 1 2</code> replacing itself
with a <code>jq</code> interpreter invoked with the specified options (<code>-M</code>,
<code>-R</code>, <code>-n</code>, <code>--args</code>), that evaluates the current file (<code>$0</code>),
with the arguments (<code>$@</code>) that were passed to <code>sh</code>.</p>
</section>
<section id="modules">
<h2>Modules <a href="#modules" class="icon-link" aria-label="Link to this section: Modules"><span class="bi bi-link-45deg" aria-hidden="true"></span></a></h2>
<p>jq has a library/module system. Modules are files whose names end
Expand Down Expand Up @@ -8353,7 +8295,6 @@ <h2>Colors <a href="#colors" class="icon-link" aria-label="Link to this section:
"Plain assignment: =": "plain-assignment",
"Complex assignments": "complex-assignments",
"Assignment": "assignment",
"Comments": "comments",
"import RelativePathString as NAME [\u003cmetadata\u003e];": "import-relativepathstring-as-name",
"include RelativePathString [\u003cmetadata\u003e];": "include-relativepathstring",
"import RelativePathString as $NAME [\u003cmetadata\u003e];": "import-relativepathstring-as-$name",
Expand Down
2 changes: 1 addition & 1 deletion manual/v1.5/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5002,7 +5002,7 @@ <h3>
<pre><code>label $out | ... break $out ...
</code></pre>
<p>The <code>break $label_name</code> expression will cause the program to
to act as though the nearest (to the left) <code>label $label_name</code>
act as though the nearest (to the left) <code>label $label_name</code>
produced <code>empty</code>.</p>
<p>The relationship between the <code>break</code> and corresponding <code>label</code>
is lexical: the label has to be "visible" from the break.</p>
Expand Down
2 changes: 1 addition & 1 deletion manual/v1.6/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5535,7 +5535,7 @@ <h3>
<pre><code>label $out | ... break $out ...
</code></pre>
<p>The <code>break $label_name</code> expression will cause the program to
to act as though the nearest (to the left) <code>label $label_name</code>
act as though the nearest (to the left) <code>label $label_name</code>
produced <code>empty</code>.</p>
<p>The relationship between the <code>break</code> and corresponding <code>label</code>
is lexical: the label has to be "visible" from the break.</p>
Expand Down
2 changes: 1 addition & 1 deletion manual/v1.7/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6041,7 +6041,7 @@ <h3>
<pre><code>label $out | ... break $out ...
</code></pre>
<p>The <code>break $label_name</code> expression will cause the program to
to act as though the nearest (to the left) <code>label $label_name</code>
act as though the nearest (to the left) <code>label $label_name</code>
produced <code>empty</code>.</p>
<p>The relationship between the <code>break</code> and corresponding <code>label</code>
is lexical: the label has to be "visible" from the break.</p>
Expand Down

0 comments on commit 2da5f72

Please sign in to comment.