diff --git a/Cargo.lock b/Cargo.lock index 6c4202b..d11a289 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -563,7 +563,7 @@ dependencies = [ [[package]] name = "tidy-viewer" -version = "1.4.3" +version = "1.4.4" dependencies = [ "atty", "calm_io", diff --git a/ci/build-deb b/ci/build-deb deleted file mode 100755 index 9ac4864..0000000 --- a/ci/build-deb +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -set -e -D="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" - -# This script builds a binary dpkg for Debian based distros. It does not -# currently run in CI, and is instead run manually and the resulting dpkg is -# uploaded to GitHub via the web UI. -# -# Note that this requires 'cargo deb', which can be installed with -# 'cargo install cargo-deb'. -# -# This should be run from the root of the tv repo. - -if ! command -V cargo-deb > /dev/null 2>&1; then - echo "cargo-deb command missing" >&2 - exit 1 -fi - -if ! command -V asciidoctor > /dev/null 2>&1; then - echo "asciidoctor command missing" >&2 - exit 1 -fi - -# 'cargo deb' does not seem to provide a way to specify an asset that is -# created at build time, such as tv's man page. To work around this, -# we force a debug build, copy out the man page (and shell completions) -# produced from that build, put it into a predictable location and then build -# the deb, which knows where to look. - -cargo build - -DEPLOY_DIR=deployment/deb -OUT_DIR="$("$D"/cargo-out-dir target/debug/)" -mkdir -p "$DEPLOY_DIR" - -# Since we're distributing the dpkg, we don't know whether the user will have -# PCRE2 installed, so just do a static build. -PCRE2_SYS_STATIC=1 cargo deb --target x86_64-unknown-linux-musl diff --git a/src/main.rs b/src/main.rs index 11fe4c0..6128251 100644 --- a/src/main.rs +++ b/src/main.rs @@ -31,6 +31,7 @@ use toml; ## ==Tidy-Viewer Config Example== ## Remove the first column of comments for valid toml file + ## All fields must be defined. Partial files will not be read. ## The delimiter separating the columns. [default: ,] #delimiter = \",\" ## Add a title to your tv. Example \'Test Data\' [default: NA (\"\")]