mirrors/nnn
1
0
Fork 0
mirror of https://github.com/jarun/nnn.git synced 2024-11-28 13:51:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support XDG_CONFIG_HOME

Browse source
This commit is contained in:
Arun Prakash Jana 2019-06-09 10:36:35 +05:30
parent fa4f082ac0
commit 80c35e85bd
No known key found for this signature in database
GPG key ID: A75979F35C080412
5 changed files with 46 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/quitcd/quitcd.bash
View file

@ -2,7 +2,7 @@ n()
{ {
nnn "$@" nnn "$@"
NNN_TMPFILE=~/.config/nnn/.lastd NNN_TMPFILE=${XDG_CONFIG_HOME:-$HOME/.config}/nnn/.lastd
if [ -f $NNN_TMPFILE ]; then if [ -f $NNN_TMPFILE ]; then
. $NNN_TMPFILE . $NNN_TMPFILE

1
scripts/quitcd/quitcd.csh
View file

@ -1,2 +1,3 @@
# NOTE: set NNN_TMPFILE correctly if you use 'XDG_CONFIG_HOME'
set NNN_TMPFILE=~/.config/nnn/.lastd set NNN_TMPFILE=~/.config/nnn/.lastd
alias n 'nnn; source "$NNN_TMPFILE"; rm "$NNN_TMPFILE"' alias n 'nnn; source "$NNN_TMPFILE"; rm "$NNN_TMPFILE"'

1
scripts/quitcd/quitcd.fish
View file

@ -5,6 +5,7 @@
function n --description 'support nnn quit and change directory' function n --description 'support nnn quit and change directory'
nnn $argv nnn $argv
# NOTE: set NNN_TMPFILE correctly if you use 'XDG_CONFIG_HOME'
set NNN_TMPFILE ~/.config/nnn/.lastd set NNN_TMPFILE ~/.config/nnn/.lastd
if test -e $NNN_TMPFILE if test -e $NNN_TMPFILE

2
scripts/quitcd/quitcd.zsh
View file

@ -2,7 +2,7 @@ n()
{ {
nnn "$@" nnn "$@"
NNN_TMPFILE=~/.config/nnn/.lastd NNN_TMPFILE=${XDG_CONFIG_HOME:-$HOME/.config}/nnn/.lastd
if [ -f $NNN_TMPFILE ]; then if [ -f $NNN_TMPFILE ]; then
. $NNN_TMPFILE . $NNN_TMPFILE

54
src/nnn.c
View file

@ -4301,47 +4301,77 @@ static void usage(void)
static bool setup_config(void) static bool setup_config(void)
{ {
size_t r, len; size_t r, len;
char *xdgcfg = getenv("XDG_CONFIG_HOME");
bool xdg = FALSE;
/* Set up configuration file paths */ /* Set up configuration file paths */
len = strlen(home) + 1 + 20; /* add length of "/.config/nnn/plugins" */ if (xdgcfg && xdgcfg[0]) {
DPRINTF_S(xdgcfg);
if (xdgcfg[0] == '~') {
r = xstrlcpy(g_buf, home, PATH_MAX);
xstrlcpy(g_buf + r - 1, xdgcfg + 1, PATH_MAX);
xdgcfg = g_buf;
DPRINTF_S(xdgcfg);
}
if (!xdiraccess(xdgcfg)) {
xerror();
return FALSE;
}
len = strlen(xdgcfg) + 1 + 12; /* add length of "/nnn/plugins" */
xdg = TRUE;
}
if (!xdg)
len = strlen(home) + 1 + 20; /* add length of "/.config/nnn/plugins" */
cfgdir = (char *)malloc(len); cfgdir = (char *)malloc(len);
plugindir = (char *)malloc(len); plugindir = (char *)malloc(len);
if (!cfgdir || !plugindir) { if (!cfgdir || !plugindir) {
xerror(); xerror();
return FALSE; return FALSE;
} }
r = xstrlcpy(cfgdir, home, len);
/* Create ~/.config */ if (xdg) {
xstrlcpy(cfgdir + r - 1, "/.config", len - r); xstrlcpy(cfgdir, xdgcfg, len);
DPRINTF_S(cfgdir); r = len - 12;
if (!create_dir(cfgdir)) { } else {
xerror(); r = xstrlcpy(cfgdir, home, len);
return FALSE;
/* Create ~/.config */
xstrlcpy(cfgdir + r - 1, "/.config", len - r);
DPRINTF_S(cfgdir);
if (!create_dir(cfgdir)) {
xerror();
return FALSE;
}
r += 8; /* length of "/.config" */
} }
/* Create ~/.config/nnn */ /* Create ~/.config/nnn */
xstrlcpy(cfgdir + r - 1, "/.config/nnn", len - r); xstrlcpy(cfgdir + r - 1, "/nnn", len - r);
DPRINTF_S(cfgdir); DPRINTF_S(cfgdir);
if (!create_dir(cfgdir)) { if (!create_dir(cfgdir)) {
xerror(); xerror();
return FALSE; return FALSE;
} }
xstrlcpy(cfgdir + r + 12 - 1, "/plugins", 9); /* Create ~/.config/nnn/plugins */
xstrlcpy(cfgdir + r + 4 - 1, "/plugins", 9);
DPRINTF_S(cfgdir); DPRINTF_S(cfgdir);
xstrlcpy(plugindir, cfgdir, len); xstrlcpy(plugindir, cfgdir, len);
DPRINTF_S(plugindir); DPRINTF_S(plugindir);
/* Create ~/.config/nnn/plugins */
if (!create_dir(cfgdir)) { if (!create_dir(cfgdir)) {
xerror(); xerror();
return FALSE; return FALSE;
} }
/* Reset to config path */ /* Reset to config path */
cfgdir[r + 11] = '\0'; cfgdir[r + 3] = '\0';
DPRINTF_S(cfgdir); DPRINTF_S(cfgdir);
/* Set selection file path */ /* Set selection file path */