diff options
| author |  Arun Prakash Jana <engineerarun@gmail.com> | 2019-12-03 21:10:42 +0530 |
|---|---|---|
| committer | Arun Prakash Jana <engineerarun@gmail.com> | 2019-12-03 21:11:06 +0530 |
| commit | add789c0020839e6ffa496820bcb09a2d5019171 (patch) | |
| tree | e587ba600b007447195c8391dc8db6f649f72fbd | |
| parent | 0acd18f9895c3575204ce18b27df2682a9359ec6 (diff) | |
| download | nnn-add789c0020839e6ffa496820bcb09a2d5019171.tar.gz | |
Use common construct for utility names
| -rw-r--r-- | plugins/README.md | 2 | ||||
| -rw-r--r-- | src/nnn.c | 12 |
2 files changed, 10 insertions, 4 deletions
diff --git a/plugins/README.md b/plugins/README.md index 86d541c..54b7e4d 100644 --- a/plugins/README.md +++ b/plugins/README.md @@ -45,7 +45,7 @@ Plugins extend the capabilities of `nnn`. They are _executable_ scripts (or bina | pdfview | View PDF file in `$PAGER` | sh | pdftotext/<br>mupdf-tools | | picker | Pick files and list one per line (to pipe) | sh | nnn | | pskill | Fuzzy list by name and kill process or zombie | sh | fzy, sudo/doas | -| renamer | Batch rename files | sh | [qmv](https://www.nongnu.org/renameutils/)/[vidir](https://joeyh.name/code/moreutils/) | +| renamer | Batch rename selection or files in dir | sh | [qmv](https://www.nongnu.org/renameutils/)/[vidir](https://joeyh.name/code/moreutils/) | | ringtone | Create a variable bitrate mp3 ringtone from file | sh | date, ffmpeg | | splitjoin | Split file or join selection | sh | split, cat | | suedit | Edit file using superuser permissions | sh | sudoedit/sudo/doas | @@ -374,6 +374,9 @@ static bool g_plinit = FALSE; #define UTIL_ARCHIVEMOUNT 9 #define UTIL_SSHFS 10 #define UTIL_RCLONE 11 +#define UTIL_VI 12 +#define UTIL_LESS 13 +#define UTIL_SH 14 /* Utilities to open files, run actions */ static char * const utils[] = { @@ -401,6 +404,9 @@ static char * const utils[] = { "archivemount", "sshfs", "rclone", + "vi", + "less", + "sh", }; /* Common strings */ @@ -5736,18 +5742,18 @@ int main(int argc, char *argv[]) cfg.useeditor = 1; /* Get VISUAL/EDITOR */ - enveditor = xgetenv(envs[ENV_EDITOR], "vi"); + enveditor = xgetenv(envs[ENV_EDITOR], utils[UTIL_VI]); editor = xgetenv(envs[ENV_VISUAL], enveditor); DPRINTF_S(getenv(envs[ENV_VISUAL])); DPRINTF_S(getenv(envs[ENV_EDITOR])); DPRINTF_S(editor); /* Get PAGER */ - pager = xgetenv(envs[ENV_PAGER], "less"); + pager = xgetenv(envs[ENV_PAGER], utils[UTIL_LESS]); DPRINTF_S(pager); /* Get SHELL */ - shell = xgetenv(envs[ENV_SHELL], "sh"); + shell = xgetenv(envs[ENV_SHELL], utils[UTIL_SH]); DPRINTF_S(shell); DPRINTF_S(getenv("PWD")); |