Bruce/bb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch from /etc/xdg/bb to /etc/bb

Browse Source
This commit is contained in:
Bruce Hill 2021-07-03 21:41:08 -07:00
parent 1d54d6a292
commit a78619a402
5 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
API.md
View File

@ -10,7 +10,7 @@ internal state.
## Helper Functions ## Helper Functions
`bb` is bundled with some helper scripts for performing common tasks. These `bb` is bundled with some helper scripts for performing common tasks. These
scripts are installed to `/etc/xdg/bb/`, which is added to `bb`'s `$PATH` scripts are installed to `/etc/bb/`, which is added to `bb`'s `$PATH`
environment variable at runtime. `~/.config/bb/` is also added to the `$PATH` environment variable at runtime. `~/.config/bb/` is also added to the `$PATH`
with higher priority, so you can override any of these scripts by putting your with higher priority, so you can override any of these scripts by putting your
own version there. own version there.

6
Makefile
View File

@ -42,8 +42,8 @@ install: $(NAME)
fi; \ fi; \
[ ! "$$prefix" ] && prefix="/usr/local"; \ [ ! "$$prefix" ] && prefix="/usr/local"; \
[ ! "$$sysconfdir" ] && sysconfdir=/etc; \ [ ! "$$sysconfdir" ] && sysconfdir=/etc; \
mkdir -pv -m 755 "$$prefix/man/man1" "$$prefix/bin" "$$sysconfdir/xdg/$(NAME)" \ mkdir -pv -m 755 "$$prefix/man/man1" "$$prefix/bin" "$$sysconfdir/$(NAME)" \
&& cp -rv scripts/* "$$sysconfdir/xdg/$(NAME)/" \ && cp -rv scripts/* "$$sysconfdir/$(NAME)/" \
&& cp -v bb.1 "$$prefix/man/man1/$(NAME).1" \ && cp -v bb.1 "$$prefix/man/man1/$(NAME).1" \
&& cp -v bbcmd.1 "$$prefix/man/man1/bbcmd.1" \ && cp -v bbcmd.1 "$$prefix/man/man1/bbcmd.1" \
&& rm -f "$$prefix/bin/$(NAME)" \ && rm -f "$$prefix/bin/$(NAME)" \
@ -58,7 +58,7 @@ uninstall:
[ ! "$$prefix" ] && prefix="/usr/local"; \ [ ! "$$prefix" ] && prefix="/usr/local"; \
[ ! "$$sysconfdir" ] && sysconfdir=/etc; \ [ ! "$$sysconfdir" ] && sysconfdir=/etc; \
echo "Deleting..."; \ echo "Deleting..."; \
rm -rvf "$$prefix/bin/$(NAME)" "$$prefix/man/man1/$(NAME).1" "$$prefix/man/man1/bbcmd.1" "$$sysconfdir/xdg/$(NAME)"; \ rm -rvf "$$prefix/bin/$(NAME)" "$$prefix/man/man1/$(NAME).1" "$$prefix/man/man1/bbcmd.1" "$$sysconfdir/$(NAME)"; \
printf "\033[1mIf you created any config files in ~/.config/$(NAME), you may want to delete them manually.\033[0m\n" printf "\033[1mIf you created any config files in ~/.config/$(NAME), you may want to delete them manually.\033[0m\n"
.PHONY: all, clean, install, uninstall .PHONY: all, clean, install, uninstall

4
README.md
View File

@ -63,13 +63,13 @@ run the shell command `rm -rf file1 file2` and then tell `bb` to deselect all
## Customizing bb ## Customizing bb
When `bb` launches, it first updates `bb`'s `$PATH` environment variable to When `bb` launches, it first updates `bb`'s `$PATH` environment variable to
include, in order, `~/.config/bb` and `/etc/xdg/bb`. Then, `bb` will run the include, in order, `~/.config/bb/` and `/etc/bb/`. Then, `bb` will run the
command `bbstartup` (the default implementation is found at command `bbstartup` (the default implementation is found at
[scripts/bbstartup](scripts/bbstartup), along with other default `bb` commands). [scripts/bbstartup](scripts/bbstartup), along with other default `bb` commands).
`bbstartup` will call `bbkeys` and may also set up configuration options like `bbstartup` will call `bbkeys` and may also set up configuration options like
which columns to display and what sort order to use. All of these behaviors can which columns to display and what sort order to use. All of these behaviors can
be customized by creating custom local versions of these files in `~/.config/bb/`. be customized by creating custom local versions of these files in `~/.config/bb/`.
The default versions can be found in `/etc/xdg/bb/`. The default versions can be found in `/etc/bb/`.
You can also create temporary bindings at runtime by hitting `Ctrl-b`, pressing You can also create temporary bindings at runtime by hitting `Ctrl-b`, pressing
the key you want to bind, and then entering in a script to run (in case you the key you want to bind, and then entering in a script to run (in case you

10
bb.c
View File

@ -117,6 +117,10 @@ void bb_browse(bb_t *bb, const char *initial_path)
{ {
if (populate_files(bb, initial_path)) if (populate_files(bb, initial_path))
clean_err("Could not find initial path: \"%s\"", initial_path); clean_err("Could not find initial path: \"%s\"", initial_path);
// Emergency fallback:
bindings[0].key = KEY_CTRL_C;
bindings[0].script = strdup("kill -INT $PPID");
bindings[0].description = strdup("Kill the bb process");
run_script(bb, "bbstartup"); run_script(bb, "bbstartup");
check_cmdfile(bb); check_cmdfile(bb);
while (!bb->should_quit) { while (!bb->should_quit) {
@ -664,8 +668,8 @@ static void run_bbcmd(bb_t *bb, const char *cmd)
} }
binding_t binding = {keyval, script2, memcheck(strdup(description))}; binding_t binding = {keyval, script2, memcheck(strdup(description))};
if (bindings[i].key == keyval) { if (bindings[i].key == keyval) {
free(bindings[i].description); free((char*)bindings[i].description);
free(bindings[i].script); free((char*)bindings[i].script);
for (; i + 1 < sizeof(bindings)/sizeof(bindings[0]) && bindings[i+1].key; i++) for (; i + 1 < sizeof(bindings)/sizeof(bindings[0]) && bindings[i+1].key; i++)
bindings[i] = bindings[i+1]; bindings[i] = bindings[i+1];
} }
@ -1159,7 +1163,7 @@ int main(int argc, char *argv[])
getenv("XDG_CONFIG_HOME"), getenv("BBPATH"), getenv("PATH")) < 0) getenv("XDG_CONFIG_HOME"), getenv("BBPATH"), getenv("PATH")) < 0)
clean_err("Could not allocate memory for PATH"); clean_err("Could not allocate memory for PATH");
} else { } else {
if (asprintf(&newpath, "%s/"BB_NAME":%s/xdg/"BB_NAME":%s", if (asprintf(&newpath, "%s/"BB_NAME":%s/"BB_NAME":%s",
getenv("XDG_CONFIG_HOME"), getenv("sysconfdir"), getenv("PATH")) < 0) getenv("XDG_CONFIG_HOME"), getenv("sysconfdir"), getenv("PATH")) < 0)
clean_err("Could not allocate memory for PATH"); clean_err("Could not allocate memory for PATH");
} }

4
types.h
View File

@ -81,8 +81,8 @@ typedef struct bb_s {
// Key bindings: // Key bindings:
typedef struct { typedef struct {
int key; int key;
char *script; const char *script;
char *description; const char *description;
} binding_t; } binding_t;
#endif #endif