Skip to content

Commit

Permalink
config option to specify archive mounter utility
Browse files Browse the repository at this point in the history
  • Loading branch information
jarun committed Apr 13, 2023
1 parent 9319b63 commit 8a1dce8
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 7 deletions.
16 changes: 12 additions & 4 deletions nnn.1
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ to see the list of keybinds.
supports the following options:
.Pp
.Fl a
auto-setup temporary NNN_FIFO (described in ENVIRONMENT section)
auto-setup temporary \fBNNN_FIFO\fR (described in \fIENVIRONMENT\fR section)
.Pp
.Fl A
disable directory auto-enter on unique filter match
Expand Down Expand Up @@ -369,17 +369,17 @@ selected entries from the listed results.
.Sh BOOKMARKS
There are 2 ways (can be used together) to manage bookmarks.
.Pp
(1) Bookmark keys: See \fINNN_BMS\fR under \fIENVIORNMENT\fR section on how to set
(1) Bookmark keys: See \fBNNN_BMS\fR under \fIENVIORNMENT\fR section on how to set
bookmark keys.

The select bookmark key \fIb\fR lists all the bookmark keys set in \fINNN_BMS\fR
The select bookmark key \fIb\fR lists all the bookmark keys set in \fBNNN_BMS\fR
in the bookmarks prompt.
.Pp
(2) Symlinked bookmarks: A symlinked bookmark to the current directory can
be created with the \fIB\fR key (or manually under ~/.config/nnn/bookmarks).

Pressing 'Enter' at the bookmarks prompt takes to this directory.
If \fINNN_BMS\fR is not set, the select bookmark key directly opens it.
If \fBNNN_BMS\fR is not set, the select bookmark key directly opens it.
.Pp
On entering a bookmark, the directory where the select bookmark key was
pressed is set as the previous directory. Press '-' to return to it.
Expand Down Expand Up @@ -540,6 +540,11 @@ separated by \fI;\fR:
NOTE: Non-default formats may require a third-party utility.
.Ed
.Pp
\fBNNN_ARCHMNT:\fR optional archive mounter utility (default: archivemount).
.Bd -literal
export NNN_ARCHIVE='fuse-archive'
.Ed
.Pp
\fBNNN_SSHFS:\fR specify custom sshfs command with options:
.Bd -literal
export NNN_SSHFS='sshfs -o reconnect,idmap=user,cache_timeout=3600'
Expand All @@ -561,6 +566,9 @@ separated by \fI;\fR:
.Ed
.Pp
\fBNNN_SEL:\fR absolute path to custom selection file.
.Bd -literal
export NNN_SEL='/tmp/.sel'
.Ed
.Pp
\fBNNN_FIFO:\fR path of a named pipe to write the hovered file path:
.Bd -literal
Expand Down
7 changes: 4 additions & 3 deletions src/nnn.c
Original file line number Diff line number Diff line change
Expand Up @@ -536,6 +536,7 @@ static runstate g_state;
#define UTIL_TRASH_CLI 18
#define UTIL_GIO_TRASH 19
#define UTIL_RM_RF 20
#define UTIL_ARCHMNT 21

/* Utilities to open files, run actions */
static char * const utils[] = {
Expand Down Expand Up @@ -576,6 +577,7 @@ static char * const utils[] = {
"trash-put",
"gio trash",
"rm -rf",
"archivemount",
};

/* Common strings */
Expand Down Expand Up @@ -4800,14 +4802,13 @@ static void valid_parent(char *path, char *lastname)

static bool archive_mount(char *newpath)
{
char *str = "install archivemount";
char *dir, *cmd = str + 8; /* Start of "archivemount" */
char *dir, *cmd = xgetenv("NNN_ARCHMNT", utils[UTIL_ARCHMNT]);
char *name = pdents[cur].name;
size_t len = pdents[cur].nlen;
char mntpath[PATH_MAX];

if (!getutil(cmd)) {
printmsg(str);
printmsg("install utility");
return FALSE;
}

Expand Down

0 comments on commit 8a1dce8

Please sign in to comment.