From 17bb57263cd9dcb017bd8c434a7e41f4af1bb459 Mon Sep 17 00:00:00 2001 From: Pavel Fokin Date: Tue, 9 Jul 2019 22:51:25 +0300 Subject: [PATCH 1/2] Add forgotten export for quitcd scripts --- misc/quitcd/quitcd.bash | 2 +- misc/quitcd/quitcd.fish | 2 +- misc/quitcd/quitcd.zsh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/misc/quitcd/quitcd.bash b/misc/quitcd/quitcd.bash index 15b9f422..e303b4cd 100644 --- a/misc/quitcd/quitcd.bash +++ b/misc/quitcd/quitcd.bash @@ -1,6 +1,6 @@ n() { - NNN_TMPFILE=${XDG_CONFIG_HOME:-$HOME/.config}/nnn/.lastd + export NNN_TMPFILE=${XDG_CONFIG_HOME:-$HOME/.config}/nnn/.lastd nnn "$@" diff --git a/misc/quitcd/quitcd.fish b/misc/quitcd/quitcd.fish index 7bc67fe4..93a9e228 100644 --- a/misc/quitcd/quitcd.fish +++ b/misc/quitcd/quitcd.fish @@ -4,7 +4,7 @@ function n --description 'support nnn quit and change directory' # NOTE: set NNN_TMPFILE correctly if you use 'XDG_CONFIG_HOME' - set NNN_TMPFILE ~/.config/nnn/.lastd + set -x NNN_TMPFILE ~/.config/nnn/.lastd nnn $argv diff --git a/misc/quitcd/quitcd.zsh b/misc/quitcd/quitcd.zsh index 207aa56b..c55b321d 100644 --- a/misc/quitcd/quitcd.zsh +++ b/misc/quitcd/quitcd.zsh @@ -1,6 +1,6 @@ n() { - NNN_TMPFILE=${XDG_CONFIG_HOME:-$HOME/.config}/nnn/.lastd + export NNN_TMPFILE=${XDG_CONFIG_HOME:-$HOME/.config}/nnn/.lastd nnn "$@" From 66fa6fc682f803a82998d03e94166a94fbad504a Mon Sep 17 00:00:00 2001 From: Pavel Fokin Date: Wed, 10 Jul 2019 15:56:17 +0300 Subject: [PATCH 2/2] Combine 'XDG_CONFIG_HOME' and 'HOME` in quitcd.fish --- misc/quitcd/quitcd.fish | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/misc/quitcd/quitcd.fish b/misc/quitcd/quitcd.fish index 93a9e228..f2a54e8a 100644 --- a/misc/quitcd/quitcd.fish +++ b/misc/quitcd/quitcd.fish @@ -3,13 +3,16 @@ # or, add the lines to the 'config.fish' file. function n --description 'support nnn quit and change directory' - # NOTE: set NNN_TMPFILE correctly if you use 'XDG_CONFIG_HOME' - set -x NNN_TMPFILE ~/.config/nnn/.lastd + if test -n "$XDG_CONFIG_HOME" + set -x NNN_TMPFILE "$XDG_CONFIG_HOME/nnn/.lastd" + else + set -x NNN_TMPFILE "$HOME/.config/nnn/.lastd" + end nnn $argv if test -e $NNN_TMPFILE - source $NNN_TMPFILE - rm $NNN_TMPFILE + source $NNN_TMPFILE + rm $NNN_TMPFILE end end