lockbox

commit 9b21ab9cf4f6c2d33464e718d13634af069f3e21
parent 262d6400823b35ea33d5bfcf556ef0996d1cf52b
Author: Sean Enck <sean@ttypty.com>
Date:   Sun, 12 Mar 2023 11:35:08 -0400

make rekey a function for tests

Diffstat:
M
tests/Makefile
 | 
2
+-
M
tests/run.sh
 | 
9
+++++++--

2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/tests/Makefile b/tests/Makefile
@@ -3,4 +3,4 @@ TESTS := password keyfile
 all: $(TESTS)
 
 $(TESTS):
-	./run.sh $@
+	@./run.sh $@
diff --git a/tests/run.sh b/tests/run.sh
@@ -7,7 +7,6 @@ CLIP_COPY="$DATA/clip.copy"
 CLIP_PASTE="$DATA/clip.paste"
 
 _execute() {
-  local rekey rekeyFile clipTries
   export LOCKBOX_HOOKDIR=""
   export LOCKBOX_STORE="${DATA}/passwords.kdbx"
   export LOCKBOX_KEY="testingkey"
@@ -64,6 +63,12 @@ _execute() {
   echo
   ${LB_BINARY} ls
   echo
+  _rekey
+  _clipboard
+}
+
+_rekey() {
+  local rekey rekeyFile 
   rekey="$LOCKBOX_STORE.rekey.kdbx"
   rekeyFile=""
   export LOCKBOX_STORE_NEW="$rekey"
@@ -77,10 +82,10 @@ _execute() {
   echo y |${LB_BINARY} rekey
   echo
   ${LB_BINARY} ls
-  _clipboard
 }
 
 _clipboard() {
+  local clipTries
   export LOCKBOX_CLIP_COPY="touch $CLIP_COPY"
   export LOCKBOX_CLIP_PASTE="touch $CLIP_PASTE"
   export LOCKBOX_CLIP_MAX=5