aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Arun Prakash Jana <engineerarun@gmail.com>2020-01-18 21:01:27 +0530
committerGravatar Arun Prakash Jana <engineerarun@gmail.com>2020-01-18 21:05:44 +0530
commit4d01aa78aeb5d1bbb32b836aaed026f4bccec3a8 (patch)
tree683b9c6dd9fa71267882986d08ed51d2c26ed784
parent6c2dc7fc95c1e36432118c17b2926952cc5e739b (diff)
downloadnnn-4d01aa78aeb5d1bbb32b836aaed026f4bccec3a8.tar.gz
Shorten env vars
-rw-r--r--nnn.112
-rw-r--r--src/nnn.c10
2 files changed, 11 insertions, 11 deletions
diff --git a/nnn.1 b/nnn.1
index b171561..e16d152 100644
--- a/nnn.1
+++ b/nnn.1
@@ -298,23 +298,23 @@ used. A single combination of arguments is supported for SHELL and PAGER.
----------------------------------- + -------------------------------------------------
.Ed
.Pp
-\fBNNN_CONTEXT_COLORS:\fR string of color codes for each context, e.g.:
+\fBNNN_COLORS:\fR string of color codes for each context, e.g.:
.Bd -literal
- export NNN_CONTEXT_COLORS='1234'
+ export NNN_COLORS='1234'
codes: 0-black, 1-red, 2-green, 3-yellow, 4-blue (default), 5-magenta, 6-cyan, 7-white
.Ed
.Pp
-\fBNNN_SSHFS_OPTS:\fR pass additional options to sshfs command:
+\fBNNN_SSHFS:\fR pass additional options to sshfs command:
.Bd -literal
- export NNN_SSHFS_OPTS='sshfs -o reconnect,idmap=user,cache_timeout=3600'
+ export NNN_SSHFS='sshfs -o reconnect,idmap=user,cache_timeout=3600'
NOTE: The options must be preceded by `sshfs` and comma-separated without any space between them.
.Ed
.Pp
-\fBNNN_RCLONE_OPTS:\fR pass additional options to rclone command:
+\fBNNN_RCLONE:\fR pass additional options to rclone command:
.Bd -literal
- export NNN_RCLONE_OPTS='rclone mount --read-only --no-checksum'
+ export NNN_RCLONE='rclone mount --read-only --no-checksum'
NOTE: The options must be preceded by `rclone` and max 5 flags are supported.
.Ed
diff --git a/src/nnn.c b/src/nnn.c
index 50449ee..50d7200 100644
--- a/src/nnn.c
+++ b/src/nnn.c
@@ -521,7 +521,7 @@ static const char * const messages[] = {
#define NNN_BMS 0
#define NNN_PLUG 1
#define NNN_OPENER 2
-#define NNN_CONTEXT_COLORS 3
+#define NNN_COLORS 3
#define NNNLVL 4
#define NNN_PIPE 5
#define NNN_ARCHIVE 6 /* strings end here */
@@ -531,7 +531,7 @@ static const char * const env_cfg[] = {
"NNN_BMS",
"NNN_PLUG",
"NNN_OPENER",
- "NNN_CONTEXT_COLORS",
+ "NNN_COLORS",
"NNNLVL",
"NNN_PIPE",
"NNN_ARCHIVE",
@@ -1213,7 +1213,7 @@ static bool selsafe(void)
static bool initcurses(mmask_t *oldmask)
{
short i;
- char *colors = xgetenv(env_cfg[NNN_CONTEXT_COLORS], "4444");
+ char *colors = xgetenv(env_cfg[NNN_COLORS], "4444");
if (cfg.picker) {
if (!newterm(NULL, stderr, stdin)) {
@@ -3489,11 +3489,11 @@ static bool remote_mount(char *newpath, int *presel)
if (opt == 's') {
cmd = utils[UTIL_SSHFS];
- env = xgetenv("NNN_SSHFS_OPTS", cmd);
+ env = xgetenv("NNN_SSHFS", cmd);
} else if (opt == 'r') {
flag |= F_NOWAIT;
cmd = utils[UTIL_RCLONE];
- env = xgetenv("NNN_RCLONE_OPTS", "rclone mount");
+ env = xgetenv("NNN_RCLONE", "rclone mount");
} else {
printwait(messages[MSG_INVALID_KEY], presel);
return FALSE;