X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=bin%2Fbtr;h=a8a29a44701d1d0aa4f912578a943954d5872f92;hb=ef064f115b81c2aeef7b0edc9e5f1d8b9d12604a;hp=5a6e190adced6a1e14282478674f82a5f0d1ef87;hpb=14b604bea2501022d3d828f746a6fa2b2055a00a;p=m6w6%2Fbtr

diff --git a/bin/btr b/bin/btr
index 5a6e190..a8a29a4 100755
--- a/bin/btr
+++ b/bin/btr
@@ -1,26 +1,21 @@
 #!/bin/bash
 
-export DATE=$(date +%Y%m%d%H%M%S)
-export CPUS=${CPUS:-$(grep -c "^processor" /proc/cpuinfo)}
+export BTR_BINDIR=$(realpath $(dirname $0)/)
+export BTR_LIBDIR=$(realpath $(dirname $0)/../share/btr)
+BTR_BANNER="Build, test & report. Simple and stupid."
 
-export BINDIR=$(realpath $(dirname $0)/)
-export LIBDIR=$(realpath $(dirname $0)/../lib/btr)
+. $BTR_LIBDIR/common.sh
+. $BTR_LIBDIR/btr.sh
 
-. $LIBDIR/btr.sh
+btr-parseopts "$@"
+btr-setup
 
-VERBOSE=false
-
-parseopts $@
-setup
-
-if $VERBOSE
+if $BTR_VERBOSE
 then
-	show_conf
-	confirm "Do you want to continue?" || exit
+	btr-conf-show
+	btr-confirm "Everything setup. Do you want to continue?"
 fi
 
-REPORT="$(make -s -C $BTRDIR -f $LIBDIR/source/$SOURCE_RULES.mk && \
-	make -s -C $BTRDIR -f $LIBDIR/build/$BUILD_RULES.mk)"
-make -s -C $BTRDIR -f $LIBDIR/report/$REPORT_RULES.mk REPORT="$REPORT"
+btr-run
 
-# vim: set noet
+# vim: noet