Skip to content

Commit

Permalink
Merge branch 'dev' into iwconfig-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
kellyjonbrazil authored Feb 14, 2024
2 parents 413ea4b + 6275591 commit b8f7ddc
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 9 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
jc changelog

20240212 v1.25.2
- Documentation updates

20240212 v1.25.1
- Fix for crash when optional libraries are not installed (e.g. xmltodict)
- Fix for `ini` parser crashing with some keys with no values
Expand Down
2 changes: 1 addition & 1 deletion docs/parsers/proc.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ Specific Proc file parser names can be found with `jc -hh` or `jc -a`.

Schemas can also be found online at:

https://kellyjonbrazil.github.io/jc/docs/parsers/proc_<name>
https://kellyjonbrazil.github.io/jc/docs/parsers/proc_<name>

For example:

Expand Down
2 changes: 1 addition & 1 deletion jc/lib.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from jc import utils


__version__ = '1.25.1'
__version__ = '1.25.2'

parsers: List[str] = [
'acpi',
Expand Down
2 changes: 1 addition & 1 deletion jc/parsers/proc.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
Schemas can also be found online at:
https://kellyjonbrazil.github.io/jc/docs/parsers/proc_<name>
https://kellyjonbrazil.github.io/jc/docs/parsers/proc_<name>
For example:
Expand Down
6 changes: 3 additions & 3 deletions man/jc.1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH jc 1 2024-02-12 1.25.1 "JSON Convert"
.TH jc 1 2024-02-12 1.25.2 "JSON Convert"
.SH NAME
\fBjc\fP \- JSON Convert JSONifies the output of many CLI tools, file-types,
and strings
Expand Down Expand Up @@ -1158,7 +1158,7 @@ Pretty print output
.TP
.B
\fB-q\fP, \fB--quiet\fP
Quiet mode. Suppresses parser warning messages (use -qq to ignore streaming
Quiet mode. Suppresses parser warning messages (use \fB-qq\fP to ignore streaming
parser errors)
.TP
.B
Expand All @@ -1168,7 +1168,7 @@ additional semantic processing
.TP
.B
\fB-s\fP, \fB--slurp\fP
Slurp multiple lines into an array. (use \fB-hhh\fP` to find compatible parsers)
Slurp multiple lines into an array. (use \fB-hhh\fP to find compatible parsers)
.TP
.B
\fB-u\fP, \fB--unbuffer\fP
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

setuptools.setup(
name='jc',
version='1.25.1',
version='1.25.2',
author='Kelly Brazil',
author_email='kellyjonbrazil@gmail.com',
description='Converts the output of popular command-line tools and file-types to JSON.',
Expand Down
4 changes: 2 additions & 2 deletions templates/manpage_template
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ Pretty print output
.TP
.B
\fB-q\fP, \fB--quiet\fP
Quiet mode. Suppresses parser warning messages (use -qq to ignore streaming
Quiet mode. Suppresses parser warning messages (use \fB-qq\fP to ignore streaming
parser errors)
.TP
.B
Expand All @@ -93,7 +93,7 @@ additional semantic processing
.TP
.B
\fB-s\fP, \fB--slurp\fP
Slurp multiple lines into an array. (use \fB-hhh\fP` to find compatible parsers)
Slurp multiple lines into an array. (use \fB-hhh\fP to find compatible parsers)
.TP
.B
\fB-u\fP, \fB--unbuffer\fP
Expand Down

0 comments on commit b8f7ddc

Please sign in to comment.