commit 245e92f233f1590b86a50c3a0622fccf46dd8ccf parent 3b6ecefe2783b65ba7a5a3447f9ffd7e4f55034a Author: Sean Enck <sean@ttypty.com> Date: Sat, 16 Jul 2022 13:15:23 -0400 renaming textconv to gitdiff Diffstat:
| M | Makefile | | | 2 | +- |
| M | README.md | | | 4 | ++-- |
| R | cmd/lb-textconv/main.go -> cmd/lb-gitdiff/main.go | | | 0 | |
| M | tests/run.sh | | | 2 | +- |
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile @@ -1,7 +1,7 @@ VERSION := development DESTDIR := BUILD := bin/ -TARGETS := $(BUILD)lb $(BUILD)lb-rw $(BUILD)lb-rekey $(BUILD)lb-textconv $(BUILD)lb-totp +TARGETS := $(BUILD)lb $(BUILD)lb-rw $(BUILD)lb-rekey $(BUILD)lb-gitdiff $(BUILD)lb-totp LIBEXEC := $(DESTDIR)libexec/lockbox/ MAIN := $(DESTDIR)bin/lb TESTDIR := $(shell find internal -type f -name "*test.go" -exec dirname {} \; | sort -u) diff --git a/README.md b/README.md @@ -85,10 +85,10 @@ lb totp -c token ## git integration -To manage the `.lb` files in a git repository and see _actual_ text diffs and this to a `.gitconfig` +To manage the `.lb` files in a git repository and see _actual_ text diffs add this to a `.gitconfig` ``` [diff "lb"] - textconv = lb textconv + textconv = lb gitdiff ``` ## build diff --git a/cmd/lb-textconv/main.go b/cmd/lb-gitdiff/main.go diff --git a/tests/run.sh b/tests/run.sh @@ -45,7 +45,7 @@ _run() { echo "5ae472abqdekjqykoyxk7hvc2leklq5n" | "$BIN/lb" insert test/totp "$BIN/lb-totp" -ls "$BIN/lb-totp" test | tr '[:digit:]' 'X' - "$BIN/lb-textconv" bin/lb/keys/one.lb bin/lb/keys/one2.lb + "$BIN/lb-gitdiff" bin/lb/keys/one.lb bin/lb/keys/one2.lb yes 2>/dev/null | "$BIN/lb" rm keys2/three echo yes 2>/dev/null | "$BIN/lb" rm test/totp