Refactored `bb +...` to `bbcmd ...` within bb bindings. This makes

things a lot less ambiguous. Also removed the default marks created in
bbstartup.sh and ensured that `$XDG_DATA_HOME` and `$XDG_CONFIG_HOME`
always get set as environment variables.

1 files changed, 3 insertions, 17 deletions

diff --git a/bbstartup.sh b/bbstartup.sh
index 38bea99..ecc7e18 100755
--- a/bbstartup.sh
+++ b/bbstartup.sh
@@ -1,28 +1,14 @@
 #!/bin/sh
 # This file contains the script that is run when bb launches
-# See API.md for details on bb's API.
-
-# Default XDG values
-[ ! "$XDG_CONFIG_HOME" ] && XDG_CONFIG_HOME=~/.config
-[ ! "$sysconfdir" ] && sysconfdir=/etc
-
-# Create some default marks:
-mkdir -p "$XDG_CONFIG_HOME/bb/marks"
-mark() {
-    ln -sT "$2" "$XDG_CONFIG_HOME/bb/marks/$1" 2>/dev/null
-}
-mark home ~
-mark root /
-mark config "$XDG_CONFIG_HOME"
-mark marks "$XDG_CONFIG_HOME/bb/marks"
+# See API.md for details on bb's command API.
 
 # Load key bindings
 # first check ~/.config/bb/bindings.bb, then /etc/xdg/bb/bindings.bb, then ./bindings.bb
 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"
+    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"
+    done | sed -e '/^#/d' -e "s/^[^ ]/$(printf '\034')bind:\\0/" | tr '\034' '\0' >> "$BBCMD"
 fi
 printf '\0' >> "$BBCMD"