From 8df4cceca0a27f192ae57bbc117674a8773082df Mon Sep 17 00:00:00 2001
From: Bruce Hill <bruce@bruce-hill.com>
Date: Wed, 6 Nov 2019 17:22:12 +0100
Subject: Added printing to `ask1` command

---
 bbstartup.sh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'bbstartup.sh')

diff --git a/bbstartup.sh b/bbstartup.sh
index e46ef64..38bea99 100755
--- a/bbstartup.sh
+++ b/bbstartup.sh
@@ -18,7 +18,11 @@ mark marks "$XDG_CONFIG_HOME/bb/marks"
 
 # Load key bindings
 # first check ~/.config/bb/bindings.bb, then /etc/xdg/bb/bindings.bb, then ./bindings.bb
-for path in "$XDG_CONFIG_HOME/bb" "$sysconfdir/xdg/bb" "."; do
-    cat "$path/bindings.bb" 2>/dev/null && break
-done | sed -e '/^#/d' -e "s/^[^ ]/$(printf '\034')+bind:\\0/" | tr '\034' '\0' >> "$BBCMD"
+if [ ! -e "$XDG_CONFIG_HOME/bb/bindings.bb" ] && [ ! -e "$sysconfdir/xdg/bb/bindings.bb" ]; then
+    cat "./bindings.bb" 2>/dev/null | sed -e '/^#/d' -e "s/^[^ ]/$(printf '\034')+bind:\\0/" | tr '\034' '\0' >> "$BBCMD"
+else
+    for path in "$sysconfdir/xdg/bb" "$XDG_CONFIG_HOME/bb"; do
+        cat "$path/bindings.bb" 2>/dev/null
+    done | sed -e '/^#/d' -e "s/^[^ ]/$(printf '\034')+bind:\\0/" | tr '\034' '\0' >> "$BBCMD"
+fi
 printf '\0' >> "$BBCMD"
-- 
cgit v1.2.3