From 1dbece8b2ef96eb03ccbc7f6b5e794d66a647d38 Mon Sep 17 00:00:00 2001
From: Bruce Hill <bruce@bruce-hill.com>
Date: Mon, 24 Feb 2020 02:57:12 -0800
Subject: Added a slightly hacky fix to make sure `bb` can be run from the
 local build directory and still have the helper scripts, bbstartup.sh, and
 the bindings work.

---
 bbstartup.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'bbstartup.sh')

diff --git a/bbstartup.sh b/bbstartup.sh
index 9058169..e316373 100755
--- a/bbstartup.sh
+++ b/bbstartup.sh
@@ -5,13 +5,13 @@
 # Load key bindings
 # first check ~/.config/bb/bindings.bb, then /etc/xdg/bb/bindings.bb, then ./bindings.bb
 [ ! -d "$XDG_DATA_HOME/bb" ] && mkdir -p "$XDG_DATA_HOME/bb"
-if [ ! -e "$XDG_CONFIG_HOME/bb/bindings.bb" ] && [ ! -e "$sysconfdir/xdg/bb/bindings.bb" ]; then
-    cat "./bindings.bb" 2>/dev/null | awk '/^#/ {next} /^[^ ]/ {printf "\0bind:"} {print $0} END {printf "\0"}' >> "$BBCMD"
+
+if [ "$BBPATH" ]; then
+    cat "$BBPATH/bindings.bb" 2>/dev/null
 else
-    for path in "$sysconfdir/xdg/bb" "$XDG_CONFIG_HOME/bb"; do
-        cat "$path/bindings.bb" 2>/dev/null
-    done | awk '/^#/ {next} /^[^ ]/ {printf "\0bind:"} {print $0} END {printf "\0"}' >> "$BBCMD"
-fi
+    cat "$sysconfdir/xdg/bb/bindings.bb" "$XDG_CONFIG_HOME/bb/bindings.bb" 2>/dev/null
+fi | awk '/^#/ {next} /^[^ ]/ {printf "\0bind:"} {print $0} END {printf "\0"}' >> "$BBCMD"
+
 if [ -e "$XDG_DATA_HOME/bb/state.sh" ]; then
     . "$XDG_DATA_HOME/bb/state.sh"
 fi
-- 
cgit v1.2.3