Skip to content

Commit

Permalink
ScriptX [v0.4.3]
Browse files Browse the repository at this point in the history
- Close #24 - Reworded cut to extract in the deb `control` file and other places.
- Instead of modifying a static man file, `make-deb` generates and compresses the man file. The man file created isn't perfect but it's better than having the man page to by out of sync with development. **NOTE:** With [Clap 3](clap-rs/clap#552) man pages generation should be possible.:w
- Replaced clap's description string with the `crate_description` macro. The `--help` application description will be the same as the one in `Cargo.toml`.
- Tweaked the wording in the `-v` option help string.
  • Loading branch information
JoelMon committed Jul 5, 2021
1 parent e6ebae6 commit 91efd0e
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 40 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# Changelog

## ScriptX [v0.4.3](https://github.com/JoelMon/scriptx/releases/tag/v0.4.3) (2021-7-05)

## Fix
- Close #24 - Reworded cut to extract in the deb `control` file and other places.

## Other
- Instead of modifying a static man file, `make-deb` generates and compresses the man file. The man file created isn't perfect but it's better than having the man page to by out of sync with development. **NOTE:** With [Clap 3](https://github.com/clap-rs/clap/issues/552) man pages generation should be possible.:w
- Replaced clap's description string with the `crate_description` macro. The `--help` application description will be the same as the one in `Cargo.toml`.
- Tweaked the wording in the `-v` option help string.

## ScriptX [v0.4.2](https://github.com/JoelMon/scriptx/releases/tag/v0.4.2) (2021-7-04)
## New Feature
- Close #21 - Added a progress bar to when using the `-a --all` flag.
Expand Down
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[package]
name = "scriptx"
version = "0.4.2"
version = "0.4.3"
authors = ["Joel Montes de Oca"]
homepage = "https://joelmon.github.io/scriptx/"
documentation = "https://github.com/JoelMon/scriptx/"
edition = "2018"
description = "ScriptX is a command line tool to cut scriptures out of the American Sign Language version of the New World Translation."
description = "ScriptX is a command line tool to extract scriptures out of the American Sign Language version of the New World Translation."
repository = "https://github.com/JoelMon/scriptx"
readme = "README.md"
license = "MIT"
Expand Down
2 changes: 1 addition & 1 deletion deb/control
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ Priority: optional
Urgency: low
Depends: ffmpeg
Maintainer: Joel Montes de Oca
Description: ScriptX is a command line tool to cut scriptures out of the American Sign Language version of the New World Translation.
Description: ScriptX is a command line tool to extract scriptures out of the American Sign Language version of the New World Translation.
Homepage: https://joelmon.github.io/scriptx/

5 changes: 2 additions & 3 deletions make-deb
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,8 @@ mkdir -p $man_dir
# Build binary and copy to bin_dir if pass
cargo build --release && cp target/release/scriptx $bin_dir/scriptx

# Copy and edit man file
cp man/scriptx.1.man $man_dir/scriptx.1
sed -i "s/ScriptX *.*.*/ScriptX $version/" $man_dir/scriptx.1
# Generate and compress the man page, help2man has to be installed
help2man -N -S Linux target/release/scriptx | gzip > $man_dir/scriptx.1.gz

# copy and edit control file
cp deb/control $debian_dir/control
Expand Down
30 changes: 0 additions & 30 deletions man/scriptx.1.man

This file was deleted.

6 changes: 3 additions & 3 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use indicatif::ProgressIterator;
use std::process::Command;
use std::u8;

use clap::{crate_authors, crate_version, App, Arg, ArgGroup, ArgMatches};
use clap::{crate_authors, crate_description, crate_version, App, Arg, ArgGroup, ArgMatches};

use crate::ffwrappers::mpeg;
use crate::ffwrappers::probe::Root;
Expand All @@ -18,11 +18,11 @@ use scriptx_errors::ScriptxErrors;
fn main() -> Result<(), ScriptxErrors> {
let m:ArgMatches = App::new("ScriptX")
.author(crate_authors!())
.about("ScriptX cuts scriptures from the American Sign Language version of the New World Translation Bible.")
.about(crate_description!())
.version(crate_version!())
.arg(
Arg::with_name("verse")
.help("The verse to be cut out. A single verse or a range of verses can be cut, eg. 2-5.")
.help("The verse to be extracted out. A single verse or a range of verses can be extracted. e.g. 2-5")
.short("v")
.long("verse")
.takes_value(true),
Expand Down

0 comments on commit 91efd0e

Please sign in to comment.