]> Sergey Matveev's repositories - nnn.git/commitdiff
trash dir is ~/.local/trash
authorArun Prakash Jana <engineerarun@gmail.com>
Sat, 2 Mar 2019 13:15:15 +0000 (18:45 +0530)
committerArun Prakash Jana <engineerarun@gmail.com>
Sat, 2 Mar 2019 13:15:15 +0000 (18:45 +0530)
README.md
nnn.1
src/nnn.c

index 270a17de1dbe0c05d2a4e063faa2bb4b47cd360b..9b3b8949527e409f026a86ad25d43ed020d6b3da 100644 (file)
--- a/README.md
+++ b/README.md
@@ -393,7 +393,7 @@ The following indicators are used in the detail view:
 | `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_0B=1` | do not open 0-byte files |
-| `NNN_TRASH=1` | move files to `~/.local/share/nnn/trash` on delete |
+| `NNN_TRASH=1` | move files to `~/.local/trash` on delete |
 | `NNN_CP_MV_PROG=1` | show copy, move progress on Linux |
 
 #### Help
diff --git a/nnn.1 b/nnn.1
index e37b2a38971d34ac8aee764a707b1d77e05145dc..c235b602d823bfdebf014e73289858da19897f53 100644 (file)
--- a/nnn.1
+++ b/nnn.1
@@ -348,7 +348,7 @@ files.
     export NNN_RESTRICT_0B=1
 .Ed
 .Pp
-\fBNNN_TRASH:\fR move files to \fB~/.local/share/nnn/trash\fR on delete.
+\fBNNN_TRASH:\fR move files to \fB~/.local/trash\fR on delete.
 .Bd -literal
     export NNN_TRASH=1
 .Ed
index 60d5dc59d64f6fc5e09798a23474a30e0a133854..d0533289cc277d611a171404d4c267b4c9aa8e08 100644 (file)
--- a/src/nnn.c
+++ b/src/nnn.c
@@ -4125,13 +4125,7 @@ int main(int argc, char *argv[])
 
                /* Create trash dir if missing */
                g_tmpfplen = xstrlcpy(g_trash, home, PATH_MAX);
-               g_tmpfplen += xstrlcpy(g_trash + g_tmpfplen - 1,
-                                     "/.local/share/nnn", PATH_MAX - g_tmpfplen);
-               DPRINTF_S(g_trash);
-               if (!createdir(g_trash, 0777))
-                       return 1;
-
-               xstrlcpy(g_trash + g_tmpfplen - 2, "/trash", PATH_MAX - g_tmpfplen);
+               xstrlcpy(g_trash + g_tmpfplen - 1, "/.local/trash", PATH_MAX - g_tmpfplen);
                DPRINTF_S(g_trash);
                if (!createdir(g_trash, 0777))
                        return 1;