From 78b3cf817af1cb8d5696d01dc41e4667338763bc Mon Sep 17 00:00:00 2001
From: Daylin Morgan <daylinmorgan@gmail.com>
Date: Thu, 10 Aug 2023 11:01:48 -0500
Subject: [PATCH] fix: correctly use exisiting env

---
 src/viv/viv.py | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/viv/viv.py b/src/viv/viv.py
index ddc6424..730a242 100755
--- a/src/viv/viv.py
+++ b/src/viv/viv.py
@@ -55,7 +55,7 @@ from typing import (
 from urllib.error import HTTPError
 from urllib.request import urlopen
 
-__version__ = "23.8a3-10-g505e79f-dev"
+__version__ = "23.8a3-11-g6b48e8c-dev"
 
 
 class Spinner:
@@ -969,6 +969,8 @@ class ViVenv:
         run_mode = Env().viv_run_mode
         _path = self.path
         try:
+            if self.loaded:
+                yield
             if keep or run_mode == "persist":
                 yield
             elif run_mode == "ephemeral":
@@ -1734,18 +1736,18 @@ class Viv:
             _, bin = self._pick_bin(reqs, bin)
             vivenv = ViVenv(spec)
 
-            if not vivenv.loaded or Env().viv_force:
-                with vivenv.use(keep=keep):
+            with vivenv.use(keep=keep):
+                if not vivenv.loaded or Env().viv_force:
                     vivenv.create()
                     vivenv.install_pkgs()
-                    vivenv.bin_exists(bin)
+                vivenv.bin_exists(bin)
 
-                    # TODO: refactor this logic elsewhere
-                    if keep or Env().run_mode != "ephemeral":
-                        vivenv.touch()
-                        vivenv.meta.write(vivenv.path / "vivmeta.json")
+                # TODO: refactor this logic elsewhere
+                if keep or Env().run_mode != "ephemeral":
+                    vivenv.touch()
+                    vivenv.meta.write(vivenv.path / "vivmeta.json")
 
-                    subprocess_run_quit([vivenv.path / "bin" / bin, *rest])
+                subprocess_run_quit([vivenv.path / "bin" / bin, *rest])
 
 
 class Arg: