Merge pull request #1639 from atomcult/posix-quitcd

quitcd.bash_zsh: make POSIX compliant; minor fixes and style changes
This commit is contained in:
Arun 2023-05-06 08:34:31 +05:30 committed by GitHub
commit 737ebaa9ef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,16 +1,16 @@
n () n ()
{ {
# Block nesting of nnn in subshells # Block nesting of nnn in subshells
if [[ "${NNNLVL:-0}" -ge 1 ]]; then [ "${NNNLVL:-0}" -eq 0 ] || {
echo "nnn is already running" echo "nnn is already running"
return return
fi }
# The behaviour is set to cd on quit (nnn checks if NNN_TMPFILE is set) # 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 # 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 # 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: # use a custom path, i.e. set NNN_TMPFILE *exactly* as follows:
# NNN_TMPFILE="${XDG_CONFIG_HOME:-$HOME/.config}/nnn/.lastd" # NNN_TMPFILE="${XDG_CONFIG_HOME:-$HOME/.config}/nnn/.lastd"
export 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 # Unmask ^Q (, ^V etc.) (if required, see `stty -a`) to Quit nnn
@ -19,12 +19,12 @@ n ()
# stty lwrap undef # stty lwrap undef
# stty lnext undef # stty lnext undef
# The backslash allows one to alias n to nnn if desired without making an # The command builtin allows one to alias nnn to n, if desired, without
# infinitely recursive alias # making an infinitely recursive alias
\nnn "$@" command nnn "$@"
if [ -f "$NNN_TMPFILE" ]; then [ ! -f "$NNN_TMPFILE" ] || {
. "$NNN_TMPFILE" . "$NNN_TMPFILE"
rm -f "$NNN_TMPFILE" > /dev/null rm -f "$NNN_TMPFILE" > /dev/null
fi }
} }