commit 95183fbef8b4f8745ceebbc0ec22a96160708ba9
parent fe96bd6bc750d89bea98d40139aab95af7939f1e
Author: J. Brock <joseph.brock@protonmail.com>
Date: Fri, 5 May 2023 00:51:39 -0400
quitcd.bash_zsh: make POSIX compliant; minor fixes and style changes
This commit makes the following changes to quitcd.bash_zsh:
- POSIX compliance and an according rename of the script
- Enforces consistent if-then statements and indentation
- Minor comment fixes
Signed-off-by: J. Brock <joseph.brock@protonmail.com>
Diffstat:
2 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/misc/quitcd/quitcd.bash_sh_zsh b/misc/quitcd/quitcd.bash_sh_zsh
@@ -0,0 +1,30 @@
+n ()
+{
+ # Block nesting of nnn in subshells
+ [ "${NNNLVL:-0}" -eq 0 ] || {
+ echo "nnn is already running"
+ return
+ }
+
+ # The behaviour is set to cd on quit (nnn checks if NNN_TMPFILE is set)
+ # If NNN_TMPFILE is set to a custom path, it must be exported for nnn to
+ # see. To cd on quit only on ^G, remove the "export" and make sure not to
+ # use a custom path, i.e. set NNN_TMPFILE *exactly* as follows:
+ # NNN_TMPFILE="${XDG_CONFIG_HOME:-$HOME/.config}/nnn/.lastd"
+ export NNN_TMPFILE="${XDG_CONFIG_HOME:-$HOME/.config}/nnn/.lastd"
+
+ # Unmask ^Q (, ^V etc.) (if required, see `stty -a`) to Quit nnn
+ # stty start undef
+ # stty stop undef
+ # stty lwrap undef
+ # stty lnext undef
+
+ # The command builtin allows one to alias nnn to n, if desired, without
+ # making an infinitely recursive alias
+ command nnn "$@"
+
+ [ ! -f "$NNN_TMPFILE" ] || {
+ . "$NNN_TMPFILE"
+ rm -f "$NNN_TMPFILE" > /dev/null
+ }
+}
diff --git a/misc/quitcd/quitcd.bash_zsh b/misc/quitcd/quitcd.bash_zsh
@@ -1,30 +0,0 @@
-n ()
-{
- # Block nesting of nnn in subshells
- if [[ "${NNNLVL:-0}" -ge 1 ]]; then
- echo "nnn is already running"
- return
- fi
-
- # The behaviour is set to cd on quit (nnn checks if NNN_TMPFILE is set)
- # If NNN_TMPFILE is set to a custom path, it must be exported for nnn to
- # see. To cd on quit only on ^G, remove the "export" and make sure not to
- # use a custom path, i.e. set NNN_TMPFILE *exactly* as follows:
- # NNN_TMPFILE="${XDG_CONFIG_HOME:-$HOME/.config}/nnn/.lastd"
- export NNN_TMPFILE="${XDG_CONFIG_HOME:-$HOME/.config}/nnn/.lastd"
-
- # Unmask ^Q (, ^V etc.) (if required, see `stty -a`) to Quit nnn
- # stty start undef
- # stty stop undef
- # stty lwrap undef
- # stty lnext undef
-
- # The backslash allows one to alias n to nnn if desired without making an
- # infinitely recursive alias
- \nnn "$@"
-
- if [ -f "$NNN_TMPFILE" ]; then
- . "$NNN_TMPFILE"
- rm -f "$NNN_TMPFILE" > /dev/null
- fi
-}