Browse Source

Move cd on quit file

The new location is ~/.config/nnn/.lastd
master
Arun Prakash Jana 5 years ago
parent
commit
fa4f082ac0
No known key found for this signature in database GPG Key ID: A75979F35C080412
7 changed files with 39 additions and 46 deletions
  1. +0
    -1
      README.md
  2. +0
    -5
      nnn.1
  3. +7
    -7
      scripts/quitcd/quitcd.bash
  4. +1
    -2
      scripts/quitcd/quitcd.csh
  5. +7
    -7
      scripts/quitcd/quitcd.fish
  6. +7
    -7
      scripts/quitcd/quitcd.zsh
  7. +17
    -17
      src/nnn.c

+ 0
- 1
README.md View File

@@ -373,7 +373,6 @@ The following indicators are used in the detail view:
| `NNN_IDLE_TIMEOUT=300` | idle seconds before locking terminal [default: disabled] |
| `NNN_COPIER='/absolute/path/to/copier'` | system clipboard copier script [default: none] |
| `NNN_NOTE=/home/user/Dropbox/notes` | path to note file [default: none] |
| `NNN_TMPFILE=/tmp/nnn` | file to write current open dir path to for cd on quit |
| `NNN_USE_EDITOR=1` | open text files in `$EDITOR` (`$VISUAL`, if defined; fallback vi) |
| `NNN_NO_AUTOSELECT=1` | do not auto-select matching dir in _nav-as-you-type_ mode |
| `NNN_RESTRICT_NAV_OPEN=1` | open files on <kbd> ↵</kbd>, not <kbd>→</kbd> or <kbd>l</kbd> |


+ 0
- 5
nnn.1 View File

@@ -174,11 +174,6 @@ when dealing with the !, e and p commands respectively. A single combination to
export NNN_NOTE='/home/user/.mynotes'
.Ed
.Pp
\fBNNN_TMPFILE:\fR when cd on quit is pressed, the absolute path of the current open directory is written to this file. A wrapper script can read this file and cd into it once the program quits.
.Bd -literal
export NNN_TMPFILE=/tmp/nnn
.Ed
.Pp
\fBNNN_USE_EDITOR:\fR use EDITOR (VISUAL takes preference, preferably CLI, fallback vi) to handle text
files.
.Bd -literal


+ 7
- 7
scripts/quitcd/quitcd.bash View File

@@ -1,11 +1,11 @@
export NNN_TMPFILE="/tmp/nnn"

n()
{
nnn "$@"
nnn "$@"

NNN_TMPFILE=~/.config/nnn/.lastd

if [ -f $NNN_TMPFILE ]; then
. $NNN_TMPFILE
rm -f $NNN_TMPFILE > /dev/null
fi
if [ -f $NNN_TMPFILE ]; then
. $NNN_TMPFILE
rm -f $NNN_TMPFILE > /dev/null
fi
}

+ 1
- 2
scripts/quitcd/quitcd.csh View File

@@ -1,3 +1,2 @@
setenv NNN_TMPFILE /tmp/nnn

set NNN_TMPFILE=~/.config/nnn/.lastd
alias n 'nnn; source "$NNN_TMPFILE"; rm "$NNN_TMPFILE"'

+ 7
- 7
scripts/quitcd/quitcd.fish View File

@@ -2,13 +2,13 @@
# e.g. ~/.config/fish/functions/n.fish
# or, add the lines to the 'config.fish' file.

export NNN_TMPFILE="/tmp/nnn"

function n --description 'support nnn quit and change directory'
nnn $argv
nnn $argv

set NNN_TMPFILE ~/.config/nnn/.lastd

if test -e $NNN_TMPFILE
source $NNN_TMPFILE
rm $NNN_TMPFILE
end
if test -e $NNN_TMPFILE
source $NNN_TMPFILE
rm $NNN_TMPFILE
end
end

+ 7
- 7
scripts/quitcd/quitcd.zsh View File

@@ -1,11 +1,11 @@
export NNN_TMPFILE="/tmp/nnn"

n()
{
nnn "$@"
nnn "$@"

NNN_TMPFILE=~/.config/nnn/.lastd

if [ -f $NNN_TMPFILE ]; then
. $NNN_TMPFILE
rm $NNN_TMPFILE
fi
if [ -f $NNN_TMPFILE ]; then
. $NNN_TMPFILE
rm $NNN_TMPFILE
fi
}

+ 17
- 17
src/nnn.c View File

@@ -391,14 +391,13 @@ static const char * const messages[] = {
#define NNN_IDLE_TIMEOUT 3
#define NNN_COPIER 4
#define NNN_NOTE 5
#define NNN_TMPFILE 6
#define NNNLVL 7 /* strings end here */
#define NNN_USE_EDITOR 8 /* flags begin here */
#define NNN_NO_AUTOSELECT 9
#define NNN_RESTRICT_NAV_OPEN 10
#define NNN_TRASH 11
#define NNNLVL 6 /* strings end here */
#define NNN_USE_EDITOR 7 /* flags begin here */
#define NNN_NO_AUTOSELECT 8
#define NNN_RESTRICT_NAV_OPEN 9
#define NNN_TRASH 10
#ifdef __linux__
#define NNN_OPS_PROG 12
#define NNN_OPS_PROG 11
#endif

static const char * const env_cfg[] = {
@@ -408,7 +407,6 @@ static const char * const env_cfg[] = {
"NNN_IDLE_TIMEOUT",
"NNN_COPIER",
"NNN_NOTE",
"NNN_TMPFILE",
"NNNLVL",
"NNN_USE_EDITOR",
"NNN_NO_AUTOSELECT",
@@ -1221,21 +1219,23 @@ static void archive_selection(const char *cmd, const char *archive, const char *

static bool write_lastdir(const char *curpath)
{
char *tmp = getenv(env_cfg[NNN_TMPFILE]);
bool ret = TRUE;
size_t len = strlen(cfgdir);

if (!tmp) {
printmsg("set NNN_TMPFILE");
return FALSE;
}
xstrlcpy(cfgdir + len, "/.lastd", 8);
DPRINTF_S(cfgdir);

FILE *fp = fopen(tmp, "w");
FILE *fp = fopen(cfgdir, "w");

if (fp) {
fprintf(fp, "cd \"%s\"", curpath);
if (fprintf(fp, "cd \"%s\"", curpath) < 0)
ret = FALSE;

fclose(fp);
}
} else
ret = FALSE;

return TRUE;
return ret;
}

static int digit_compare(const char *a, const char *b)


Loading…
Cancel
Save