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

Fixed up some makefile stuff with NAME flag

Browse Source
This commit is contained in:
Bruce Hill 2021-01-28 20:15:31 -08:00
parent 1857870ccb
commit e0af178df1
2 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile
View File

@ -6,6 +6,7 @@ O=-O2
CFLAGS=-std=c99 -Werror -D_XOPEN_SOURCE=700 -D_GNU_SOURCE -D_POSIX_C_SOURCE=200809L CFLAGS=-std=c99 -Werror -D_XOPEN_SOURCE=700 -D_GNU_SOURCE -D_POSIX_C_SOURCE=200809L
CWARN=-Wall -Wpedantic -Wextra -Wsign-conversion -Wtype-limits -Wunused-result CWARN=-Wall -Wpedantic -Wextra -Wsign-conversion -Wtype-limits -Wunused-result
#CFLAGS += -fsanitize=address -fno-omit-frame-pointer #CFLAGS += -fsanitize=address -fno-omit-frame-pointer
CFLAGS += '-DBB_NAME="$(NAME)"'
CFILES=draw.c bterm.c CFILES=draw.c bterm.c
OBJFILES=$(CFILES:.c=.o) OBJFILES=$(CFILES:.c=.o)
@ -18,8 +19,8 @@ clean:
.c.o: .c.o:
$(CC) -c $(CFLAGS) $(CWARN) $(G) $(O) -o $@ $< $(CC) -c $(CFLAGS) $(CWARN) $(G) $(O) -o $@ $<
$(NAME): $(OBJFILES) $(NAME).c $(NAME): $(OBJFILES) bb.c
$(CC) $(CFLAGS) $(CWARN) $(G) $(O) -o $@ $(OBJFILES) $(NAME).c $(CC) $(CFLAGS) $(CWARN) $(G) $(O) -o $@ $(OBJFILES) bb.c
install: $(NAME) install: $(NAME)
@prefix="$(PREFIX)"; \ @prefix="$(PREFIX)"; \
@ -29,9 +30,10 @@ install: $(NAME)
fi; \ fi; \
[ ! "$$prefix" ] && prefix="/usr/local"; \ [ ! "$$prefix" ] && prefix="/usr/local"; \
[ ! "$$sysconfdir" ] && sysconfdir=/etc; \ [ ! "$$sysconfdir" ] && sysconfdir=/etc; \
mkdir -pv -m 755 "$$prefix/share/man/man1" "$$prefix/bin" "$$sysconfdir/xdg/bb" \ mkdir -pv -m 755 "$$prefix/man/man1" "$$prefix/bin" "$$sysconfdir/xdg/$(NAME)" \
&& cp -rv scripts/* "$$sysconfdir/xdg/bb/" \ && cp -rv scripts/* "$$sysconfdir/xdg/$(NAME)/" \
&& cp -v bb.1 bbcmd.1 "$$prefix/share/man/man1/" \ && cp -v bb.1 "$$prefix/man/man1/$(NAME).1" \
&& cp -v bbcmd.1 "$$prefix/man/man1/bbcmd.1" \
&& rm -f "$$prefix/bin/$(NAME)" \ && rm -f "$$prefix/bin/$(NAME)" \
&& cp -v $(NAME) "$$prefix/bin/" && cp -v $(NAME) "$$prefix/bin/"
@ -44,7 +46,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/share/man/man1/bb.1" "$$prefix/share/man/man1/bbcmd.1" "$$sysconfdir/xdg/bb"; \ rm -rvf "$$prefix/bin/$(NAME)" "$$prefix/man/man1/$(NAME).1" "$$prefix/man/man1/bbcmd.1" "$$sysconfdir/xdg/$(NAME)"; \
printf "\033[1mIf you created any config files in ~/.config/bb, 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

22
bb.c
View File

@ -23,6 +23,10 @@
#include "bb.h" #include "bb.h"
#include "draw.h" #include "draw.h"
#ifndef BB_NAME
#define BB_NAME "bb"
#endif
// Functions // Functions
void bb_browse(bb_t *bb, const char *initial_path); void bb_browse(bb_t *bb, const char *initial_path);
static void check_cmdfile(bb_t *bb); static void check_cmdfile(bb_t *bb);
@ -84,8 +88,8 @@ static const struct termios default_termios = {
.c_cc[VTIME] = 0, .c_cc[VTIME] = 0,
}; };
static const char *description_str = "bb - an itty bitty console TUI file browser\n"; static const char *description_str = BB_NAME" - an itty bitty console TUI file browser\n";
static const char *usage_str = "Usage: bb (-h/--help | -v/--version | -s | -d | -0 | +command)* [[--] directory]\n"; static const char *usage_str = "Usage: "BB_NAME" (-h/--help | -v/--version | -s | -d | -0 | +command)* [[--] directory]\n";
// Variables used within this file to track global state // Variables used within this file to track global state
@ -961,9 +965,9 @@ static void set_title(bb_t *bb)
{ {
char *home = getenv("HOME"); char *home = getenv("HOME");
if (home && strncmp(bb->path, home, strlen(home)) == 0) if (home && strncmp(bb->path, home, strlen(home)) == 0)
fprintf(tty_out, "\033]2;bb: ~%s\007", bb->path + strlen(home)); fprintf(tty_out, "\033]2;"BB_NAME": ~%s\007", bb->path + strlen(home));
else else
fprintf(tty_out, "\033]2;bb: %s\007", bb->path); fprintf(tty_out, "\033]2;"BB_NAME": %s\007", bb->path);
} }
/* /*
@ -1066,7 +1070,7 @@ int main(int argc, char *argv[])
return 0; return 0;
} else if (strcmp(argv[i], "--version") == 0) { } else if (strcmp(argv[i], "--version") == 0) {
version: version:
printf("bb " BB_VERSION "\n"); printf(BB_NAME" "BB_VERSION"\n");
return 0; return 0;
} else if (argv[i][0] == '-' && argv[i][1] != '-') { } else if (argv[i][0] == '-' && argv[i][1] != '-') {
for (char *c = &argv[i][1]; *c; c++) { for (char *c = &argv[i][1]; *c; c++) {
@ -1096,10 +1100,10 @@ int main(int argc, char *argv[])
// Set up environment variables // Set up environment variables
// Default values // Default values
setenv("TMPDIR", "/tmp", 0); setenv("TMPDIR", "/tmp", 0);
sprintf(cmdfilename, "%s/bb.XXXXXX", getenv("TMPDIR")); sprintf(cmdfilename, "%s/"BB_NAME".XXXXXX", getenv("TMPDIR"));
int cmdfd; int cmdfd;
if ((cmdfd = mkostemp(cmdfilename, O_APPEND)) == -1) if ((cmdfd = mkostemp(cmdfilename, O_APPEND)) == -1)
err("Couldn't create bb command file: '%s'", cmdfilename); err("Couldn't create "BB_NAME" command file: '%s'", cmdfilename);
setenv("BBCMD", cmdfilename, 1); setenv("BBCMD", cmdfilename, 1);
char xdg_config_home[PATH_MAX], xdg_data_home[PATH_MAX]; char xdg_config_home[PATH_MAX], xdg_data_home[PATH_MAX];
sprintf(xdg_config_home, "%s/.config", getenv("HOME")); sprintf(xdg_config_home, "%s/.config", getenv("HOME"));
@ -1120,11 +1124,11 @@ int main(int argc, char *argv[])
setenv("BBPATH", bbpath, 1); setenv("BBPATH", bbpath, 1);
} }
if (getenv("BBPATH")) { if (getenv("BBPATH")) {
if (asprintf(&newpath, "%s/bb:%s/scripts:%s", if (asprintf(&newpath, "%s/"BB_NAME":%s/scripts:%s",
getenv("XDG_CONFIG_HOME"), getenv("BBPATH"), getenv("PATH")) < 0) getenv("XDG_CONFIG_HOME"), getenv("BBPATH"), getenv("PATH")) < 0)
err("Could not allocate memory for PATH"); err("Could not allocate memory for PATH");
} else { } else {
if (asprintf(&newpath, "%s/bb:%s/xdg/bb:%s", if (asprintf(&newpath, "%s/"BB_NAME":%s/xdg/"BB_NAME":%s",
getenv("XDG_CONFIG_HOME"), getenv("sysconfdir"), getenv("PATH")) < 0) getenv("XDG_CONFIG_HOME"), getenv("sysconfdir"), getenv("PATH")) < 0)
err("Could not allocate memory for PATH"); err("Could not allocate memory for PATH");
} }