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

Revert rename cp mv progress

Browse source
This commit is contained in:
Arun Prakash Jana 2019-08-16 22:22:45 +05:30
parent db83e95a37
commit 1294a9caf5
No known key found for this signature in database
GPG key ID: A75979F35C080412
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -227,7 +227,7 @@ Option completion scripts for Bash, Fish and Zsh can be found in respective subd
| `NNN_NO_AUTOSELECT=1` | do not auto-select matching dir in _nav-as-you-type_ mode | | `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> | | `NNN_RESTRICT_NAV_OPEN=1` | open files on <kbd> ↵</kbd>, not <kbd>→</kbd> or <kbd>l</kbd> |
| `NNN_TRASH=1` | trash files to the desktop Trash [default: delete] | | `NNN_TRASH=1` | trash files to the desktop Trash [default: delete] |
| `NNN_CP_MV_PROG=1` | show copy, move progress on Linux | | `NNN_OPS_PROG=1` | show copy, move progress on Linux |
#### Cmdline options #### Cmdline options

4
nnn.1
View file

@ -206,9 +206,9 @@ files.
export NNN_TRASH=1 export NNN_TRASH=1
.Ed .Ed
.Pp .Pp
\fBNNN_CP_MV_PROG:\fR show progress of copy, move operations (Linux-only, needs advcpmv). \fBNNN_OPS_PROG:\fR show progress of copy, move operations (Linux-only, needs advcpmv).
.Bd -literal .Bd -literal
export NNN_CP_MV_PROG=1 export NNN_OPS_PROG=1
NOTE: BSD and macOS users can press '^T' to check the progress. NOTE: BSD and macOS users can press '^T' to check the progress.
.Ed .Ed

6
src/nnn.c
View file

@ -408,7 +408,7 @@ static const char * const messages[] = {
#define NNN_RESTRICT_NAV_OPEN 9 #define NNN_RESTRICT_NAV_OPEN 9
#define NNN_TRASH 10 #define NNN_TRASH 10
#ifdef __linux__ #ifdef __linux__
#define NNN_CP_MV_PROG 11 #define NNN_OPS_PROG 11
#endif #endif
static const char * const env_cfg[] = { static const char * const env_cfg[] = {
@ -424,7 +424,7 @@ static const char * const env_cfg[] = {
"NNN_RESTRICT_NAV_OPEN", "NNN_RESTRICT_NAV_OPEN",
"NNN_TRASH", "NNN_TRASH",
#ifdef __linux__ #ifdef __linux__
"NNN_CP_MV_PROG", "NNN_OPS_PROG",
#endif #endif
}; };
@ -4941,7 +4941,7 @@ int main(int argc, char *argv[])
cfg.nonavopen = 1; cfg.nonavopen = 1;
#ifdef __linux__ #ifdef __linux__
if (!xgetenv_set(env_cfg[NNN_CP_MV_PROG])) { if (!xgetenv_set(env_cfg[NNN_OPS_PROG])) {
cp[5] = cp[4]; cp[5] = cp[4];
cp[2] = cp[4] = ' '; cp[2] = cp[4] = ' ';