]> Sergey Matveev's repositories - nnn.git/commitdiff
quitcd.bash_zsh: make POSIX compliant; minor fixes and style changes
authorJ. Brock <joseph.brock@protonmail.com>
Fri, 5 May 2023 04:51:39 +0000 (00:51 -0400)
committerJ. Brock <joseph.brock@protonmail.com>
Fri, 5 May 2023 18:42:13 +0000 (14:42 -0400)
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>
misc/quitcd/quitcd.bash_sh_zsh [moved from misc/quitcd/quitcd.bash_zsh with 64% similarity]

similarity index 64%
rename from misc/quitcd/quitcd.bash_zsh
rename to misc/quitcd/quitcd.bash_sh_zsh
index 2450b7956dd564d3b04ebcb047981d79fc63b912..79e7ea4c20d87b0b7eb8818cdd07e30965be5f92 100644 (file)
@@ -1,16 +1,16 @@
 n ()
 {
     # Block nesting of nnn in subshells
-    if [[ "${NNNLVL:-0}" -ge 1 ]]; then
+    [ "${NNNLVL:-0}" -eq 0 ] || {
         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"
+    #      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
@@ -19,12 +19,12 @@ n ()
     # stty lwrap undef
     # stty lnext undef
 
-    # The backslash allows one to alias n to nnn if desired without making an
-    # infinitely recursive alias
-    \nnn "$@"
+    # The command builtin allows one to alias nnn to n, if desired, without
+    # making an infinitely recursive alias
+    command nnn "$@"
 
-    if [ -f "$NNN_TMPFILE" ]; then
-            . "$NNN_TMPFILE"
-            rm -f "$NNN_TMPFILE" > /dev/null
-    fi
+    [ ! -f "$NNN_TMPFILE" ] || {
+        . "$NNN_TMPFILE"
+        rm -f "$NNN_TMPFILE" > /dev/null
+    }
 }