`efefa1f12b7aab75c5f67fe7eb49926fe23e7436`

Author: Michael Aquilina <michaelaquilina@gmail.com>
Committer: Michael Aquilina <michaelaquilina@gmail.com>
Date: 2018-04-16 13:30 UTC

Message

Dont switch to default env on rmvenv command if no virtual_env is active

Diff

 1diff --git a/autoswitch_virtualenv.plugin.zsh b/autoswitch_virtualenv.plugin.zsh
 2index c4190b52b5f2fc8a35031bda8cf71f579d4a1e27..faafa873ceccc70b1e1754b904f59857f0347a32 100644
 3--- a/autoswitch_virtualenv.plugin.zsh
 4+++ b/autoswitch_virtualenv.plugin.zsh
 5@@ -99,11 +99,17 @@ function _default_venv()
 6 function rmvenv()
 7 {
 8   if [[ -f ".venv" ]]; then
 9+
10     venv_name="$(<.venv)"
11-    current_venv="$(basename $VIRTUAL_ENV)"
12-    if [[ "$current_venv" = "$venv_name" ]]; then
13-      _default_venv
14+
15+    # detect if we need to switch virtualenv first
16+    if [[ -n "$VIRTUAL_ENV" ]]; then
17+        current_venv="$(basename $VIRTUAL_ENV)"
18+        if [[ "$current_venv" = "$venv_name" ]]; then
19+            _default_venv
20+        fi
21     fi
22+
23     rmvirtualenv "$venv_name"
24     rm ".venv"
25   else