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

diff --git a/bin/btr b/bin/btr
index 5a6e190..6f303b7 100755
--- a/bin/btr
+++ b/bin/btr
@@ -4,23 +4,26 @@ export DATE=$(date +%Y%m%d%H%M%S)
 export CPUS=${CPUS:-$(grep -c "^processor" /proc/cpuinfo)}
 
 export BINDIR=$(realpath $(dirname $0)/)
-export LIBDIR=$(realpath $(dirname $0)/../lib/btr)
+export LIBDIR=$(realpath $(dirname $0)/../share/btr)
 
 . $LIBDIR/btr.sh
 
+QUIET=false
 VERBOSE=false
+FORCEYES=false
 
-parseopts $@
+parseopts "$@"
 setup
 
 if $VERBOSE
 then
 	show_conf
-	confirm "Do you want to continue?" || exit
+	$FORCEYES || confirm "Everything setup. Do you want to continue?" || exit
 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"
+set -e
+make -e $SILENT_FLAG -C $BTRDIR -f $LIBDIR/source/$SOURCE_RULES.mk
+make -e $SILENT_FLAG -C $BTRDIR -f $LIBDIR/build/$BUILD_RULES.mk
+make -e $SILENT_FLAG -C $BTRDIR -f $LIBDIR/report/$REPORT_RULES.mk
 
-# vim: set noet
+# vim: noet