diff options
| author | Thomas Schmucker <ts@its1.de> | 2026-01-30 11:50:54 +0100 |
|---|---|---|
| committer | Thomas Schmucker <ts@its1.de> | 2026-01-30 11:50:54 +0100 |
| commit | d9e2175271a8fc89497f28d50114754b362e32c9 (patch) | |
| tree | fa9fa182f4f6e9db9d8580f735c53c675fedb516 | |
| parent | dbddfc2e82a04ce1b824ce75aabf09c18152220f (diff) | |
| parent | 98d8a7c1ba6f3d2c546e25394f3045835975834a (diff) | |
| download | dotfiles-d9e2175271a8fc89497f28d50114754b362e32c9.tar.gz dotfiles-d9e2175271a8fc89497f28d50114754b362e32c9.tar.bz2 dotfiles-d9e2175271a8fc89497f28d50114754b362e32c9.zip | |
Merge branch 'master' of raspi2:/srv/git/dotfiles
| -rw-r--r-- | zsh/zshrc | 4 |
1 files changed, 2 insertions, 2 deletions
| @@ -2,9 +2,9 @@ | |||
| 2 | 2 | ||
| 3 | # Hooks | 3 | # Hooks |
| 4 | function chpwd() { | 4 | function chpwd() { |
| 5 | if [[ -n "$VIRTUAL_ENV" ]]; then | 5 | if [[ -n "$VIRTUAL_ENV" && -f "$VIRTUAL_ENV/bin/activate" ]]; then |
| 6 | local venv_dir="${VIRTUAL_ENV:h}" | 6 | local venv_dir="${VIRTUAL_ENV:h}" |
| 7 | if [[ "$PWD" != "$venv_dir"* ]]; then | 7 | if [[ "$PWD" != "$venv_dir"* ]] && (( $+functions[deactivate] )); then |
| 8 | deactivate | 8 | deactivate |
| 9 | fi | 9 | fi |
| 10 | fi | 10 | fi |