commit ffab57b407a8965cc42a1fdcc3e9cb136ada7d9e
parent 82890f9c53306267bc98e3d7bc6a08c7f8a26313
Author: Sean Enck <sean@ttypty.com>
Date: Mon, 11 Oct 2021 19:49:52 -0400
switch to meson
Diffstat:
6 files changed, 23 insertions(+), 104 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -14,8 +14,14 @@ jobs:
with:
go-version: ${{ matrix.go-version }}
- uses: actions/checkout@v2
- - name: "configure"
- run: "./configure"
- - name: "build"
- run: make
+ - name: "deps"
+ run: apt-get install -y meson ninja-build
+ - name: "meson"
+ run: meson setup build
+ - name: "ninja"
+ working-directory: build
+ run: ninja
+ - name: "test"
+ working-directory: build
+ run: ninja test
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1 @@
bin/
-Makefile
diff --git a/configure b/configure
@@ -1,88 +0,0 @@
-#!/usr/bin/env bash
-
-BASH_ON=1
-TOTP_ON=1
-PWGEN_ON=1
-STATS_ON=1
-DIFF_ON=1
-APPS=(lb lb-rekey lb-rw)
-BIN_PATH="bin/"
-GENERATED="internal/generated.go"
-
-for i in "$@"; do
- case $i in
- --disable-bash-completions)
- BASH_ON=0
- shift
- ;;
- --disable-totp)
- TOTP_ON=0
- shift
- ;;
- --disable-pwgen)
- PWGEN_ON=0
- shift
- ;;
- --disable-git)
- STATS_ON=0
- DIFF_ON=0
- shift
- ;;
- *)
- echo "unknown option: $i"
- exit 1
- ;;
- esac
-done
-
-if [ $BASH_ON -eq 1 ]; then
- APPS+=(lb-bash)
-fi
-if [ $TOTP_ON -eq 1 ]; then
- APPS+=(lb-totp)
-fi
-if [ $PWGEN_ON -eq 1 ]; then
- APPS+=(lb-pwgen)
-fi
-if [ $STATS_ON -eq 1 ]; then
- APPS+=(lb-stats)
-fi
-if [ $DIFF_ON -eq 1 ]; then
- APPS+=(lb-diff)
-fi
-
-_generate() {
- local binapps app cnt binapp
- binapps=()
- for app in ${APPS[@]}; do
- binapps+=($BIN_PATH$app)
- done
- echo "# Autogenerated file
-FLAGS := -ldflags \"-X main.version=\$(shell git log -n 1 --format=%h)\" -trimpath -buildmode=pie -mod=readonly -modcacherw
-
-all: prep binaries test
-
-binaries: ${binapps[@]}
-
-test:
- make -C tests
-
-prep:
- mkdir -p $BIN_PATH
-
-clean:
- rm -rf $BIN_PATH
- rm -f $GENERATED
-"
-
- cnt=0
- for binapp in ${binapps[@]}; do
- app=${APPS[$cnt]}
- cnt=$((cnt+1))
- echo "$binapp: go.* cmd/$app/*.go internal/*"
- echo " go build -o $binapp \$(FLAGS) cmd/$app/main.go"
- echo
- done
-}
-
-_generate | sed 's/^ /\t/g' > Makefile
diff --git a/tests/Makefile b/tests/Makefile
@@ -1,2 +0,0 @@
-all:
- ./run.sh
diff --git a/tests/expected.log b/tests/expected.log
@@ -9,9 +9,9 @@ keys/one
keys/one2
keys2/three
uuuuuuuuuu
-rekeying: bin/lb/keys/one.lb
-rekeying: bin/lb/keys/one2.lb
-rekeying: bin/lb/keys2/three.lb
+rekeying: /keys/one.lb
+rekeying: /keys/one2.lb
+rekeying: /keys2/three.lb
remove entry? (y/N)
keys/one2
keys2/three
@@ -34,5 +34,5 @@ XXXXXX
test2
remove entry? (y/N)
remove entry? (y/N)
-rekeying: bin/lb/keys/one2.lb
+rekeying: /keys/one2.lb
test2
diff --git a/tests/run.sh b/tests/run.sh
@@ -1,6 +1,10 @@
#!/bin/bash
-BIN=../bin/
-TESTS="$PWD/bin"
+BIN="$1"
+TESTS="bin"
+if [ ! -x "$BIN/lb" ]; then
+ echo "binaries missing?"
+ exit 1
+fi
export LOCKBOX_STORE="$TESTS/lb"
export LOCKBOX_KEYMODE="plaintext"
@@ -36,8 +40,8 @@ _run() {
$BIN/lb show keys2/three
echo "5ae472abqdekjqykoyxk7hvc2leklq5n" | $BIN/lb insert totp/test
$BIN/lb-totp ls
- $BIN/lb-totp test | tr '[:digit:]' 'XXXXXX'
- $BIN/lb-stats keys/one
+ $BIN/lb-totp test | tr '[:digit:]' 'X'
+ $BIN/lb-stats keys/one2
$BIN/lb-diff bin/lb/keys/one.lb bin/lb/keys/one2.lb
yes 2>/dev/null | $BIN/lb rm keys2/three
echo
@@ -48,7 +52,7 @@ _run() {
}
LOG=$TESTS/lb.log
-_run | sed "s#$PWD/##g" > $LOG
+_run | sed "s#$LOCKBOX_STORE##g" > $LOG
diff -u $LOG expected.log
if [ $? -ne 0 ]; then
exit 1
