accounting/bench
2
0
Fork 0
mirror of https://github.com/frappe/bench.git synced 2025-01-09 08:30:39 +00:00
Code Issues Releases Activity

Merge branch 'staging' into v5.x

Browse Source
This commit is contained in:
Ankush Menat 2024-02-24 12:09:53 +05:30
commit 8025aa8d27
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bench/cli.py
View File

@ -132,10 +132,7 @@ def cli():
bench_command()
if in_bench:
if cmd_from_sys in get_frappe_commands():
frappe_cmd()
else:
app_cmd()
frappe_cmd()
bench_command()

10
bench/utils/bench.py
View File

@ -32,8 +32,13 @@ logger = logging.getLogger(bench.PROJECT_NAME)
@lru_cache(maxsize=None)
def get_env_cmd(cmd: str, bench_path: str = ".") -> str:
# this supports envs' generated by patched virtualenv or venv (which may cause an extra 'local' folder to be created)
exact_location = os.path.abspath(
os.path.join(bench_path, "env", "bin", cmd.strip("*"))
)
if os.path.exists(exact_location):
return exact_location
# this supports envs' generated by patched virtualenv or venv (which may cause an extra 'local' folder to be created)
existing_python_bins = glob(
os.path.join(bench_path, "env", "**", "bin", cmd), recursive=True
)
@ -41,8 +46,7 @@ def get_env_cmd(cmd: str, bench_path: str = ".") -> str:
if existing_python_bins:
return os.path.abspath(existing_python_bins[0])
cmd = cmd.strip("*")
return os.path.abspath(os.path.join(bench_path, "env", "bin", cmd))
return exact_location
def get_venv_path(verbose=False, python="python3"):