Use variable to prevent hook redefinition #2

templates/bash.txt

@@ -47,16 +47,14 @@ function __zoxide_hook() {
 {%- endmatch %}
 
 # Initialize hook.
+if [ "${__zoxide_hooked}" != '1' ]; then
+    __zoxide_hooked='1'
     {%- if hook == Hook::None %}
     {{ NOT_CONFIGURED }}
-
     {%- else %}
-if [ "${__zoxide_hooked}" != '1' ]; then
     PROMPT_COMMAND="${PROMPT_COMMAND:+${PROMPT_COMMAND};}__zoxide_hook"
-    __zoxide_hooked='1'
-fi
-
     {%- endif %}
+fi
 
 {{ SECTION }}
 # When using zoxide with --no-aliases, alias these internal functions as
@@ -72,7 +70,7 @@ function __zoxide_z() {
             __zoxide_cd "${OLDPWD}"
         else
             # shellcheck disable=SC2016
-            \builtin echo 'zoxide: $OLDPWD is not set'
+            \builtin printf 'zoxide: $OLDPWD is not set\n'
             return 1
         fi
     elif [ "$#" -eq 1 ] && [ -d "$1" ]; then

templates/fish.txt

@@ -30,19 +30,19 @@ end
 #
 
 # Initialize hook to add new entries to the database.
+if test "$__zoxide_hooked" != '1'
+    set __zoxide_hooked '1'
     {%- match hook %}
     {%- when Hook::None %}
     function __zoxide_hook
-
     {%- when Hook::Prompt %}
     function __zoxide_hook --on-event fish_prompt
-
     {%- when Hook::Pwd %}
     function __zoxide_hook --on-variable PWD
-
     {%- endmatch %}
         command zoxide add (__zoxide_pwd)
     end
+end
 
 {{ SECTION }}
 # When using zoxide with --no-aliases, alias these internal functions as

templates/posix.txt

@@ -1,13 +1,6 @@
 {%- let SECTION = "# =============================================================================\n#" -%}
 {%- let NOT_CONFIGURED = "# -- not configured --" -%}
 
-{%- if hook == Hook::Pwd -%}
-\echo "\
-zoxide: PWD hooks are not supported on POSIX shells.
-        Use '--hook prompt' when initializing zoxide."
-
-{% endif -%}
-
 {{ SECTION }}
 # Utility functions for zoxide.
 #
@@ -47,20 +40,19 @@ __zoxide_hook() {
 {%- endmatch %}
 
 # Initialize hook.
+if [ "${__zoxide_hooked}" != '1' ]; then
+    __zoxide_hooked='1'
     {%- match hook %}
     {%- when Hook::None %}
     {{ NOT_CONFIGURED }}
-
     {%- when Hook::Prompt %}
-if [ "${__zoxide_hooked}" != '1' ]; then
     PS1="${PS1}\$(__zoxide_hook)"
-    __zoxide_hooked='1'
-fi
-
     {%- when Hook::Pwd %}
-{{ NOT_CONFIGURED }}
+    \printf "%s\n%s\n" \
-
+        "zoxide: PWD hooks are not supported on POSIX shells." \
+        "        Use '--hook prompt' when initializing zoxide."
     {%- endmatch %}
+fi
 
 {{ SECTION }}
 # When using zoxide with --no-aliases, alias these internal functions as
@@ -76,7 +68,7 @@ __zoxide_z() {
             __zoxide_cd "${OLDPWD}"
         else
             # shellcheck disable=SC2016
-            \echo 'zoxide: $OLDPWD is not set'
+            \printf 'zoxide: $OLDPWD is not set'
             return 1
         fi
     elif [ "$#" -eq 1 ] && [ -d "$1" ]; then

templates/powershell.txt

@@ -28,29 +28,29 @@ function __zoxide_hook {
 }
 
 # Initialize hook.
+if ($__zoxide_hooked -ne '1') {
+    $__zoxide_hooked = '1'
     {%- match hook %}
     {%- when Hook::None %}
     {{ NOT_CONFIGURED }}
-
     {%- when Hook::Prompt %}
-$PreZoxidePrompt = $function:prompt
+    $__zoxide_prompt_old = $function:prompt
     function prompt {
         $null = __zoxide_hook
-    & $PreZoxidePrompt
+        & $__zoxide_prompt_old
     }
-
     {%- when Hook::Pwd %}
     if ($PSVersionTable.PSVersion.Major -ge 6) {
         $ExecutionContext.InvokeCommand.LocationChangedAction = {
             $null = __zoxide_hook
         }
     } else {
-    Write-Error "`
+        Write-Error ("`n" +
-zoxide: PWD hooks are not supported below PowerShell 6.
+            "zoxide: PWD hooks are not supported below PowerShell 6.`n" +
-        Use '--hook prompt' when initializing zoxide."
+            "        Use '--hook prompt' when initializing zoxide.")
     }
-
     {%- endmatch %}
+}
 
 {{ SECTION }}
 # When using zoxide with --no-aliases, alias these internal functions as

templates/zsh.txt

@@ -29,19 +29,17 @@ function __zoxide_hook() {
 }
 
 # Initialize hook.
+if [ "${__zoxide_hooked}" != '1' ]; then
+    __zoxide_hooked='1'
     {%- match hook %}
     {%- when Hook::None %}
     {{ NOT_CONFIGURED }}
-
     {%- when Hook::Prompt %}
-[[ -n "${precmd_functions[(r)__zoxide_hook]}" ]] || {
     precmd_functions+=(__zoxide_hook)
-}
-
     {%- when Hook::Pwd %}
     chpwd_functions=(${chpwd_functions[@]} "__zoxide_hook")
-
     {%- endmatch %}
+fi
 
 {{ SECTION }}
 # When using zoxide with --no-aliases, alias these internal functions as
@@ -56,7 +54,7 @@ function __zoxide_z() {
         if [ -n "$OLDPWD" ]; then
             __zoxide_cd "$OLDPWD"
         else
-            \builtin echo 'zoxide: \$OLDPWD is not set'
+            \builtin printf 'zoxide: $OLDPWD is not set'
             return 1
         fi
     elif [ "$#" -eq 1 ] &&  [ -d "$1" ]; then