daylin/viv
1
0
Fork 0
mirror of https://github.com/daylinmorgan/viv.git synced 2024-11-09 19:13:14 -06:00
Code Issues Projects Releases Packages Wiki Activity

fix: actually get viv_run_mode

Browse source
This commit is contained in:
Daylin Morgan 2023-08-21 12:08:01 -05:00
parent 17785a6dc5
commit 2adcd6faf4
Signed by: daylin
GPG key ID: C1E52E7DD81DF79F
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/viv/viv.py
View file

@ -52,7 +52,7 @@ from typing import (
Union, Union,
) )
__version__ = "23.8b2-dev" __version__ = "23.8b2-1-g17785a6-dev"
class Spinner: class Spinner:
@ -961,6 +961,8 @@ class ViVenv:
) )
def ensure(self) -> None: def ensure(self) -> None:
# FIXME: doens't account for the ephemeral case...
# should this be encapuslated in the use method?
if not self.loaded or Env().viv_force: if not self.loaded or Env().viv_force:
self.create() self.create()
self.install_pkgs() self.install_pkgs()
@ -1249,9 +1251,10 @@ class Cache:
def __init__(self) -> None: def __init__(self) -> None:
self.vivenvs = self._get_venvs() self.vivenvs = self._get_venvs()
def _get_venvs(self) -> Dict[str, ViVenv]: def _get_venvs(self, cache_dir: Path = Cfg().cache_venv) -> Dict[str, ViVenv]:
# TODO: should this be a set instead?
vivenvs = {} vivenvs = {}
for p in Cfg().cache_venv.iterdir(): for p in cache_dir.iterdir():
vivenv = ViVenv.load(p.name) vivenv = ViVenv.load(p.name)
vivenvs[vivenv.name] = vivenv vivenvs[vivenv.name] = vivenv
return vivenvs return vivenvs
@ -1790,13 +1793,13 @@ class Viv:
with vivenv.use(keep=keep): with vivenv.use(keep=keep):
vivenv.ensure() vivenv.ensure()
vivenv.bin_exists(bin)
# TODO: refactor this logic elsewhere # TODO: refactor this logic elsewhere
if keep or Env().run_mode != "ephemeral": if keep or Env().viv_run_mode != "ephemeral":
vivenv.touch() vivenv.touch()
vivenv.meta.write(vivenv.path / "vivmeta.json") vivenv.meta.write(vivenv.path / "vivmeta.json")
vivenv.bin_exists(bin)
subprocess_run_quit([vivenv.path / "bin" / bin, *rest]) subprocess_run_quit([vivenv.path / "bin" / bin, *rest])