From d8fb19c80e3db09baef49490e2ce00c0d0c9965d Mon Sep 17 00:00:00 2001 From: Caleb Cox Date: Wed, 20 Mar 2024 10:56:13 -0500 Subject: [PATCH] Do not run __portman_sync_env during init --- .github/workflows/e2e.yml | 2 +- e2e/{test_bash.bash => test.bash} | 0 e2e/{test_fish.fish => test.fish} | 0 e2e/{test_zsh.zsh => test.zsh} | 0 src/shells/init.bash | 2 -- src/shells/init.fish | 2 -- src/shells/init.zsh | 2 -- 7 files changed, 1 insertion(+), 7 deletions(-) rename e2e/{test_bash.bash => test.bash} (100%) rename e2e/{test_fish.fish => test.fish} (100%) rename e2e/{test_zsh.zsh => test.zsh} (100%) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 4d5137c..239358f 100644 --- 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 b/e2e/test.bash similarity index 100% rename from e2e/test_bash.bash rename to e2e/test.bash diff --git a/e2e/test_fish.fish b/e2e/test.fish similarity index 100% rename from e2e/test_fish.fish rename to e2e/test.fish diff --git a/e2e/test_zsh.zsh b/e2e/test.zsh similarity index 100% rename from e2e/test_zsh.zsh rename to e2e/test.zsh diff --git a/src/shells/init.bash b/src/shells/init.bash index 3cfc8fa..408cf9d 100644 --- 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 index 79ab1e9..0284bd2 100644 --- a/src/shells/init.fish +++ b/src/shells/init.fish @@ -27,5 +27,3 @@ function __portman_preexec_hook --on-event fish_preexec # Without clearing the cd hook, the cd hook and prompt hook would both sync the port functions -e __portman_cd_hook end - -__portman_prompt_hook diff --git a/src/shells/init.zsh b/src/shells/init.zsh index e51a64c..d003ab1 100644 --- 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