Do not run __portman_sync_env during init

canac · Mar 20, 2024 · 518b095 · 518b095
1 parent 707bd73
commit 518b095
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -19,4 +19,4 @@ jobs:
       - run: |
           eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
           ./e2e/setup.sh
-          ./e2e/test_${{ matrix.shell }}.${{ matrix.shell }}
+          ./e2e/test.${{ matrix.shell }}
diff --git a/e2e/test_bash.bash → e2e/test.bash b/e2e/test_bash.bash → e2e/test.bash
@@ -2,6 +2,8 @@
 set -ex
 
 eval "$(portman init bash)"
+$PROMPT_COMMAND
+
 # Test shell integration setting port
 test -n "$PORT"
 test 4000 = "$PORTMAN_LINKED_PORT"

diff --git a/e2e/test_fish.fish → e2e/test.fish b/e2e/test_fish.fish → e2e/test.fish
@@ -1,6 +1,8 @@
 #!/usr/bin/env fish
 
 portman init fish | source
+__portman_prompt_hook
+
 # Test shell integration setting port
 test -n $PORT || return 1
 test 4000 = $PORTMAN_LINKED_PORT || return 1

diff --git a/e2e/test_zsh.zsh → e2e/test.zsh b/e2e/test_zsh.zsh → e2e/test.zsh
@@ -2,6 +2,8 @@
 set -ex
 
 eval "$(portman init zsh)"
+__portman_sync_env
+
 # Test shell integration setting port
 test -n "$PORT"
 test 4000 = "$PORTMAN_LINKED_PORT"

diff --git a/src/shells/init.bash b/src/shells/init.bash
@@ -24,5 +24,3 @@ if [[ -z "$PROMPT_COMMAND" ]]; then
 elif [[ "$PROMPT_COMMAND" != *"__portman_sync_env"* ]]; then
     PROMPT_COMMAND="__portman_sync_env;$PROMPT_COMMAND"
 fi
-
-__portman_sync_env
diff --git a/src/shells/init.fish b/src/shells/init.fish
@@ -24,8 +24,6 @@ function __portman_prompt_hook --on-event fish_prompt
 end
 
 function __portman_preexec_hook --on-event fish_preexec
-    # Without clearing the cd hook, the cd hook and prompt hook would both sync the port
+    # Without clearing the cd hook, the cd hook and prompt hook would both sync the environment
     functions -e __portman_cd_hook
 end
-
-__portman_prompt_hook
diff --git a/src/shells/init.zsh b/src/shells/init.zsh
@@ -22,5 +22,3 @@ portman() {
 autoload -Uz add-zsh-hook
 add-zsh-hook chpwd __portman_sync_env
 add-zsh-hook precmd __portman_sync_env
-
-__portman_sync_env