mirrors/ohmyzsh-mirror
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-04-10 16:32:00 +00:00
Code Issues Releases Wiki Activity

Compare commits

base: mirrors:master
Branches Tags
mirrors:master
...
compare: mirrors:8b0f5b76f45b371377e7ed2a863df3f8b5d6dc70
Branches Tags
mirrors:master

9 Commits
master ... 8b0f5b76f4

Author SHA1 Message Date
Stephan Schielke
8b0f5b76f4 Merge c40dc822a0 into 9e2c1548c3 2026-03-30 23:25:21 +00:00
Stephan Schielke
c40dc822a0 Merge branch 'ohmyzsh:master' into master 2026-03-31 00:25:17 +01:00
Stephan Schielke
5eb59aab8d Revert "✨ feat: Ignore Stakpak session files in .gitignore" 
This reverts commit b9288d65e3.

# Conflicts:
#	.gitignore
 2026-03-30 23:48:37 +01:00
Stephan Schielke
1c966955ec ♻️ refactor: Rename grep.zsh.no back to grep.zsh 2026-03-30 23:45:38 +01:00
Stephan Schielke
48cf5e4389 Merge branch 'master' into fork-master 
# Conflicts:
#	.gitignore
 2026-03-29 09:10:44 +01:00
Stephan Schielke
b9288d65e3 ✨ feat: Ignore Stakpak session files in .gitignore 
- Added `.stakpak/session*` to ignore Stakpak session files
 2026-03-24 04:38:50 +00:00
Stephan Schielke
dd9e36f3ce 🧹 chore: Rename grep.zsh to .no for cleanup 2026-03-24 04:38:50 +00:00
Stephan Schielke
afd28c55b4 Merge branch 'ohmyzsh:master' into master 2026-03-24 04:32:12 +00:00
Developer
f61f623b5b fix(poetry-env): handle in-project virtual environments when path returns "." 
When Poetry is configured with virtualenvs.in-project = true,
poetry env info --path returns "." instead of the full path.
This causes the plugin to fail with "no such file or directory: ./bin/activate".

Changes:
- Handle case where poetry returns "." by converting to $PWD/.venv
- Add safety check to ensure activate script exists before sourcing
- Maintain backward compatibility with existing setups

Fixes issue with in-project virtual environments used in monorepos and git worktrees.
 2025-06-25 00:51:17 +01:00
1 changed files with 6 additions and 1 deletions
Expand all files Collapse all files

7
plugins/poetry-env/poetry-env.plugin.zsh
View File

@@ -15,7 +15,12 @@ _togglePoetryShell() {
# Activate the environment if in a Poetry directory and no environment is currently active
if [[ $in_poetry_dir -eq 1 ]] && [[ $poetry_active -ne 1 ]]; then
venv_dir=$(poetry env info --path 2>/dev/null)
if [[ -n "$venv_dir" ]]; then
# Handle case where poetry returns "." for in-project virtual environments
if [[ "$venv_dir" == "." ]]; then
venv_dir="$PWD/.venv"
fi
# Only proceed if venv_dir is set and the activate script exists
if [[ -n "$venv_dir" && -f "${venv_dir}/bin/activate" ]]; then
export poetry_active=1
export poetry_dir="$PWD"
source "${venv_dir}/bin/activate"