diff --git a/css/base.scss~ b/css/base.scss~ deleted file mode 100644 index f3f3717e..00000000 --- a/css/base.scss~ +++ /dev/null @@ -1,95 +0,0 @@ -@charset "utf-8"; - -/* HTML resets */ -body, html, div, p, img, h1, h2, h3, h4, h5, h6, ol, ul, li { margin: 0; padding: 0; font-weight: normal; font-size: 100%; outline: none; border: none;} - -/* HTML5 block elements */ -header, section, article, footer, aside, nav { display: block; } - -/* Put your styles below here */ -#wrapper { margin: 0 auto; width: 660px; } - -body { font-family: "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif; } - -header { - margin-top: 5em; - - #logo { - width: 145px; - height: 145px; - margin: 0 auto; - -moz-border-radius: 72px; - -webkit-border-radius: 72px; - background-color: black; - - a { - position: absolute; - margin: 1em 0 0em 1.5em; - color: white; - text-align: center; - text-transform: lowercase; - text-decoration: none; - font-weight: 100; - } - - } - - #navigation { - margin: 5em 0; - text-transform: lowercase; - text-align: center; - font-style: italic; - font-size: 0.8em; - li:not(:last-child):after { content: " /"; } - - a { color: black; text-decoration: none; } - a:hover { text-decoration: underline; } - - } -} - - -nav li { display: inline; list-style-type: none; } - -#breadcrumbs, footer { color: gray; font-size: 0.7em; } - -#breadcrumbs { - li:not(:last-child):after { content: " ➔";} - border-top: 1px solid lightgray; - padding-top:5px; - a { color: inherit; } -} - -#sub-navigation{ - font-size: 0.8em; - li { display: block; margin-bottom: 5px; } -} - -nav, footer { margin: 1em 0; } - -/* Typesetting */ -h1, h2, h3, h4, h5, h6 { margin: 1.25em 0; } - -h1 { font-size: 2em; } -h2 { font-size: 1.6em; } -h3 { font-size: 1.4em; } -h4 { font-size: 1.2em; } -h5 { font-size: 1em; } -h6 { font-size: 0.9em; } - -a { color: #256ec4; } -p { font-size: 0.8em; line-height: 140%; margin-bottom: 10px; color: #333;} - -/* Floating the Magic template */ -.magic article { - width: 450px; - float: left; - border-right: 1px solid lightgray; - margin-right: 14px; - padding-right: 15px; -} -.magic aside { - width: 180px; - float: left -} -.clear{ clear: both; } \ No newline at end of file diff --git a/download/index.html b/download/index.html index f488da7c..a24a4790 100644 --- a/download/index.html +++ b/download/index.html @@ -53,25 +53,51 @@

Download jq

-

jq is written in C and has no runtime dependencies, so it should be possible to build it for nearly any platform. Prebuilt binaries are available for Linux (64-bit x86) and OS X.

+

jq is written in C and has no runtime dependencies, so it should be possible to build it for nearly any platform. Prebuilt binaries are available for Linux, OS X and Windows.

- - -

The binaries should just run, but you may need to make them executable first using:

- -
chmod +x jq
+

The binaries should just run, but on OS X and Linux you may need to make them executable first using chmod +x jq.

jq is licensed under the MIT license. For all of the gory details, read the file COPYING in the source distribution.

-

Hacking on jq

+

Linux

-

If you want to work on jq, grab the source from https://github.com/stedolan/jq.

+ + +

OS X

+ + + +

Windows

+ + + +

From source on Linux or OS X

+ +
git clone https://github.com/stedolan/jq.git
+cd jq
+make && sudo make install

To build it from a git clone, you’ll need to install a few packages first:

@@ -87,13 +113,13 @@
  • Make
  • -

    Most of these aren’t necessary if you’re just trying to compile jq from the released tarball - that version has the non-platform-specific build steps already done, so you’ll only need a C compiler and make to finish it off.

    +

    For Linux systems, these will all be in your system’s package manager, and if you do development on the machine they’re most likely already installed.

    -

    For Linux systems, these will all be in your system’s package manager, and if you do development on the machine they’re most likely already installed. I have no idea how to get these installed on OS X, you’re on your own there.

    +

    On OS X, these are all included in Apple’s command line tools, which can be installed from Xcode. However, you may find that you need a newer version of Bison than the one provided by Apple. This can be found in Homebrew or MacPorts.

    flex and bison are used to generate the lexer and parser for jq, and some python scripts generate the UTF8 encoding tables needed for JSON parsing.

    -

    Building the documentation

    +

    Building the documentation

    jq’s documentation is compiled into static HTML using Bonsai. To view the documentation locally, run rake serve from the docs/ subdirectory.

    diff --git a/download/linux32/jq b/download/linux32/jq new file mode 100755 index 00000000..59a0cf00 Binary files /dev/null and b/download/linux32/jq differ diff --git a/download/linux32/jq_test b/download/linux32/jq_test new file mode 100755 index 00000000..21fea168 Binary files /dev/null and b/download/linux32/jq_test differ diff --git a/download/linux64/jq b/download/linux64/jq new file mode 100755 index 00000000..dd3b458d Binary files /dev/null and b/download/linux64/jq differ diff --git a/download/linux64/jq_test b/download/linux64/jq_test new file mode 100755 index 00000000..b8da9209 Binary files /dev/null and b/download/linux64/jq_test differ diff --git a/download/linux_x86_64/jq b/download/linux_x86_64/jq deleted file mode 100755 index 4395acc1..00000000 Binary files a/download/linux_x86_64/jq and /dev/null differ diff --git a/download/osx32/jq b/download/osx32/jq new file mode 100755 index 00000000..397b20ff Binary files /dev/null and b/download/osx32/jq differ diff --git a/download/osx32/jq_test b/download/osx32/jq_test new file mode 100755 index 00000000..42d253f6 Binary files /dev/null and b/download/osx32/jq_test differ diff --git a/download/osx64/jq b/download/osx64/jq new file mode 100755 index 00000000..dde95d45 Binary files /dev/null and b/download/osx64/jq differ diff --git a/download/osx64/jq_test b/download/osx64/jq_test new file mode 100755 index 00000000..0e91e1db Binary files /dev/null and b/download/osx64/jq_test differ diff --git a/download/osx_64/jq b/download/osx_64/jq deleted file mode 100755 index c7b521ec..00000000 Binary files a/download/osx_64/jq and /dev/null differ diff --git a/download/source/jq.tgz b/download/source/jq.tgz deleted file mode 100644 index 7238a14e..00000000 Binary files a/download/source/jq.tgz and /dev/null differ diff --git a/download/win32/jq b/download/win32/jq new file mode 100755 index 00000000..fa0c3d12 Binary files /dev/null and b/download/win32/jq differ diff --git a/download/win32/jq_test b/download/win32/jq_test new file mode 100755 index 00000000..93126854 Binary files /dev/null and b/download/win32/jq_test differ diff --git a/download/win64/jq b/download/win64/jq new file mode 100755 index 00000000..39175d16 Binary files /dev/null and b/download/win64/jq differ diff --git a/download/win64/jq_test b/download/win64/jq_test new file mode 100755 index 00000000..eae2267e Binary files /dev/null and b/download/win64/jq_test differ diff --git a/index.html b/index.html index 60acff43..900d058a 100644 --- a/index.html +++ b/index.html @@ -55,12 +55,12 @@

    jq is a lightweight and flexible command-line JSON processor.

    - Download jq-1.1 + Download jq-1.2
    @@ -71,12 +71,19 @@
    -

    jq is like sed for JSON data - you can use it to slice and filter and map and transform structured data with the same ease that sed, awk, grep and friends let you play with text.

    -

    jq is written in portable C, and it has zero runtime dependencies. You can download a single binary, scp it to a far away machine, and expect it to work.

    -

    jq can mangle the data format that you have into the one that you want with very little effort, and the program to do so is often shorter and simpler than you’d expect.

    +

    jq is like sed for JSON data – you can use it to slice and filter +and map and transform structured data with the same ease that sed, +awk, grep and friends let you play with text.

    +

    jq is written in portable C, and it has zero runtime +dependencies. You can download a single binary, scp it to a far away +machine, and expect it to work.

    +

    jq can mangle the data format that you have into the one that you +want with very little effort, and the program to do so is often +shorter and simpler than you’d expect.

    -

    Go read the tutorial for more, or the manual for way more.

    +

    Go read the tutorial for more, or the manual +for way more.