From 443680ac0021000ff56b73ecb2024e4a6a120701 Mon Sep 17 00:00:00 2001 From: electricboogie <32370782+kimono-koans@users.noreply.github.com> Date: Wed, 20 Dec 2023 20:10:35 -0600 Subject: [PATCH] Bump version --- Cargo.lock | 2 +- Cargo.toml | 2 +- httm.1 | 63 ++++++++++++--------------- third_party/LICENSES_THIRD_PARTY.html | 2 +- 4 files changed, 31 insertions(+), 38 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 811eaa97..826e5e43 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -498,7 +498,7 @@ dependencies = [ [[package]] name = "httm" -version = "0.33.0" +version = "0.33.1" dependencies = [ "clap 3.2.25", "crossbeam-channel", diff --git a/Cargo.toml b/Cargo.toml index 363a63fb..d0377bc1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "httm" authors = ["Robert Swinford gmail.com>"] -version = "0.33.0" +version = "0.33.1" edition = "2021" keywords = ["zfs", "backup", "restore", "cli-utility", "snapshot"] description = "A CLI tool for viewing snapshot file versions on ZFS and btrfs datasets" diff --git a/httm.1 b/httm.1 index 04d75c11..61ce89aa 100644 --- a/httm.1 +++ b/httm.1 @@ -1,9 +1,9 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.49.3. -.TH HTTM "1" "December 2023" "httm 0.33.0" "User Commands" +.TH HTTM "1" "December 2023" "httm 0.33.1" "User Commands" .SH NAME -httm \- manual page for httm 0.33.0 +httm \- manual page for httm 0.33.1 .SH DESCRIPTION -httm 0.33.0 +httm 0.33.1 httm prints the size, date and corresponding locations of available unique versions of files residing on snapshots. May also be used interactively to select and restore from such versions, and even to snapshot datasets which contain certain files. @@ -77,20 +77,14 @@ NOTE: Be certain such replicated datasets are mounted before use. httm will sil ignore unmounted datasets in the interactive modes. .HP \fB\-p\fR, \fB\-\-preview[=\fR...] -.TP -user may specify a command to preview snapshots while in select view. -This argument -.TP -optionally takes a value specifying the command to be executed. -The default -.TP -value/command, if no command value specified, is a 'bowie' formatted 'diff'. -User .IP -defined commands must specify the snapshot file name "{snap_file}" and the live file -name "{live_file}" within their shell command. NOTE: 'bash' is required to bootstrap -any preview script, even if user defined preview commands or script is written in a -different language. +user may specify a command to preview snapshots while in a snapshot selection view. +This argument optionally takes a value specifying the command to be executed. The +default value/command, if no command value specified, is a 'bowie' formatted 'diff'. +User defined commands must specify the snapshot file name "{snap_file}" and the live +file name "{live_file}" within their shell command. NOTE: 'bash' is required to +bootstrap any preview script, even if user defined preview commands or script is written +in a different language. .HP \fB\-\-uniqueness[=\fR...] .IP @@ -166,18 +160,14 @@ fail for any reason, httm will roll back to the pre\-execution state. Caveats: ZFS only option which requires super user privileges. .HP \fB\-m\fR, \fB\-\-file\-mount[=\fR...] -.TP -display the all mount point/s of all dataset/s which contain/s the input file/s. -This -.TP -argument optionally takes a value. -Possible values are: "target" or "directory", return .IP -the directory upon which the underlying dataset or device of the mount, "source" or -"device" or "dataset", return the underlying dataset/device of the mount, and, -"relative\-path" or "relative", return the path relative to the underlying dataset/device -of the mount. [aliases: mount] [possible values: source, target, directory, device, -dataset, relative\-path, relative, relpath] +by default, display the all mount point/s of all dataset/s which contain/s the input +file/s. This argument optionally takes a value to display other information about the +path. Possible values are: "target" or "directory", return the directory upon which the +underlying dataset or device of the mount, "source" or "device" or "dataset", return the +underlying dataset/device of the mount, and, "relative\-path" or "relative", return the +path relative to the underlying dataset/device of the mount. [aliases: mount] [possible +values: source, target, directory, device, dataset, relative\-path, relative, relpath] .HP \fB\-l\fR, \fB\-\-last\-snap[=\fR...] .IP @@ -200,7 +190,7 @@ NEWLINE character. [aliases: newline] \fB\-0\fR, \fB\-\-zero\fR .IP display the snapshot locations only, without extraneous information, delimited by a NULL -character. +character. [aliases: null] .HP \fB\-\-not\-so\-pretty\fR .IP @@ -212,9 +202,11 @@ display the ordinary output, but tab delimited, without any pretty border lines. display the ordinary output, but as formatted JSON. .HP \fB\-\-omit\-ditto\fR +.TP +omit display of the snapshot version which may be identical to the live version. +By .IP -omit display of the snapshot version which may be identical to the live version (`httm` -ordinarily displays all snapshot versions and the live version). +default, `httm` displays all snapshot versions and the live version). .HP \fB\-\-no\-filter\fR .IP @@ -226,7 +218,7 @@ that is the path being searched. .HP \fB\-\-no\-hidden\fR .IP -never show information regarding hidden files and directories (those that start with a +do not show information regarding hidden files and directories (those that start with a \&'.') in the recursive or interactive modes. .HP \fB\-\-one\-filesystem\fR @@ -250,9 +242,10 @@ live versions of files or directories). [aliases: dead, disco] .HP \fB\-\-no\-snap\fR .IP -only display information concerning 'pseudo\-live' versions in Display Recursive mode (in -\fB\-\-deleted\fR, \fB\-\-recursive\fR, but non\-interactive modes). Useful for finding the "files that -once were" and displaying only those pseudo\-live/zombie files. [aliases: undead, zombie] +only display information concerning 'pseudo\-live' versions in any Display Recursive mode +(in \fB\-\-deleted\fR, \fB\-\-recursive\fR, but non\-interactive modes). Useful for finding the "files +that once were" and displaying only those pseudo\-live/zombie files. [aliases: undead, +zombie] .HP \fB\-\-map\-aliases\fR .IP @@ -283,7 +276,7 @@ use UTC for date display and timestamps .HP \fB\-\-no\-clones\fR .IP -ordinarily, when copying files from snapshots, httm will first attempt a zero copy +by default, when copying files from snapshots, httm will first attempt a zero copy "reflink" clone on systems that support it. Here, you may disable that behavior, and force httm to use the fall back diff copy behavior as the default. You may also set an environment variable to any value, "HTTM_NO_CLONE" to disable. diff --git a/third_party/LICENSES_THIRD_PARTY.html b/third_party/LICENSES_THIRD_PARTY.html index bffcf898..2fa4720a 100644 --- a/third_party/LICENSES_THIRD_PARTY.html +++ b/third_party/LICENSES_THIRD_PARTY.html @@ -4455,7 +4455,7 @@

Used by:

Mozilla Public License 2.0

Used by:

Mozilla Public License Version 2.0
 ==================================