mirrors/nnn
1
0
Fork 0
mirror of https://github.com/jarun/nnn.git synced 2024-11-17 16:39:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #1355: interpret suffix $nnn when paging

Browse source
This commit is contained in:
Arun Prakash Jana 2022-05-10 19:46:19 +05:30
parent 4ddd048feb
commit 18a6a010cf
No known key found for this signature in database
GPG key ID: A75979F35C080412
3 changed files with 21 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
nnn.1
View file

@ -410,20 +410,21 @@ separated by \fI;\fR:
NOTES: NOTES:
1. Use single quotes for $NNN_PLUG so $nnn is not interpreted 1. Use single quotes for $NNN_PLUG so $nnn is not interpreted
2. (Again) add \fB!\fR before the command 2. $nnn must be the last argument (if used) to run a \fIcommand as plugin\fR
3. To disable directory refresh after running a \fIcommand as plugin\fR, 3. (Again) add \fB!\fR before the command
4. To disable directory refresh after running a \fIcommand as plugin\fR,
prefix with \fB-!\fR prefix with \fB-!\fR
4. To skip user confirmation after command execution, suffix with \fB*\fR 5. To skip user confirmation after command execution, suffix with \fB*\fR
Note: Do not use \fB*\fR with programs those run and exit e.g. cat Note: Do not use \fB*\fR with programs those run and exit e.g. cat
export NNN_PLUG='y:-!sync*' export NNN_PLUG='y:-!sync*'
5. To run a \fIGUI app as plugin\fR, add a \fB&\fR after \fB!\fR 6. To run a \fIGUI app as plugin\fR, add a \fB&\fR after \fB!\fR
Note: \fI$nnn\fR must be the last argument in this case. Note: \fI$nnn\fR must be the last argument in this case.
export NNN_PLUG='m:-!&mousepad $nnn' export NNN_PLUG='m:-!&mousepad $nnn'
6. To show the output of run-and-exit commands which do not need user input, 7. To show the output of run-and-exit commands which do not need user input,
add \fB|\fR (pipe) after \fB!\fR add \fB|\fR (pipe) after \fB!\fR
Note: This option is incompatible with \fB&\fR (terminal output is masked Note: This option is incompatible with \fB&\fR (terminal output is masked
for GUI programs) and ignores \fB*\fR (output is already paged for user) for GUI programs) and ignores \fB*\fR (output is already paged for user)

5
plugins/README.md
View file

@ -183,8 +183,9 @@ This option is incompatible with `&` (terminal output is masked for GUI programs
Notes: Notes:
1. Use single quotes for `$NNN_PLUG` so `$nnn` is not interpreted 1. Use single quotes for `$NNN_PLUG` so `$nnn` is not interpreted
2. (_Again_) add `!` before the command 2. `$nnn` must be the last argument (if used) to run a _command as plugin_
3. To disable directory refresh after running a _command as plugin_, prefix with `-!` 3. (_Again_) add `!` before the command
4. To disable directory refresh after running a _command as plugin_, prefix with `-!`
#### Some useful key-command examples #### Some useful key-command examples

22
src/nnn.c
View file

@ -5142,7 +5142,7 @@ static void setexports(void)
setenv("NNN_INCLUDE_HIDDEN", xitoa(cfg.showhidden), 1); setenv("NNN_INCLUDE_HIDDEN", xitoa(cfg.showhidden), 1);
} }
static bool run_cmd_as_plugin(const char *file, char *runfile, uchar_t flags) static void run_cmd_as_plugin(const char *file, char *runfile, uchar_t flags)
{ {
size_t len; size_t len;
@ -5155,18 +5155,18 @@ static bool run_cmd_as_plugin(const char *file, char *runfile, uchar_t flags)
--len; --len;
} }
if (flags & F_PAGE) if ((flags & F_PAGE) || (flags & F_NOTRACE)) {
get_output(g_buf, NULL, NULL, -1, TRUE, TRUE);
else if (flags & F_NOTRACE) {
if (is_suffix(g_buf, " $nnn")) if (is_suffix(g_buf, " $nnn"))
g_buf[len - 5] = '\0'; g_buf[len - 5] = '\0';
else else
runfile = NULL; runfile = NULL;
spawn(g_buf, runfile, NULL, NULL, flags);
if (flags & F_PAGE)
get_output(g_buf, runfile, NULL, -1, TRUE, TRUE);
else // F_NOTRACE
spawn(g_buf, runfile, NULL, NULL, flags);
} else } else
spawn(utils[UTIL_SH_EXEC], g_buf, NULL, NULL, flags); spawn(utils[UTIL_SH_EXEC], g_buf, NULL, NULL, flags);
return TRUE;
} }
static bool plctrl_init(void) static bool plctrl_init(void)
@ -5296,8 +5296,10 @@ static bool run_plugin(char **path, const char *file, char *runfile, char **last
if (!*file) if (!*file)
return FALSE; return FALSE;
if ((flags & F_NOTRACE) || (flags & F_PAGE)) if ((flags & F_NOTRACE) || (flags & F_PAGE)) {
return run_cmd_as_plugin(file, runfile, flags); run_cmd_as_plugin(file, runfile, flags);
return TRUE;
}
cmd_as_plugin = TRUE; cmd_as_plugin = TRUE;
} }
@ -5331,7 +5333,7 @@ static bool run_plugin(char **path, const char *file, char *runfile, char **last
} else } else
spawn(g_buf, NULL, *path, sel, 0); spawn(g_buf, NULL, *path, sel, 0);
} else } else
run_cmd_as_plugin(file, NULL, flags); run_cmd_as_plugin(file, runfile, flags);
close(wfd); close(wfd);
_exit(EXIT_SUCCESS); _exit(EXIT_SUCCESS);