Merge branch 'develop' into staging

frappe · Aug 7, 2022 · 61728a1 · 61728a1
2 parents 7d6dccb + dea3278
commit 61728a1
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/bench/bench.py b/bench/bench.py
@@ -70,7 +70,7 @@ def __init__(self, path):
 
 	@property
 	def python(self) -> str:
-		return get_env_cmd("python*", bench_path=self.name)
+		return get_env_cmd("python", bench_path=self.name)
 
 	@property
 	def shallow_clone(self) -> bool:

diff --git a/bench/cli.py b/bench/cli.py
@@ -188,13 +188,13 @@ def change_uid():
 
 
 def app_cmd(bench_path="."):
-	f = get_env_cmd("python*", bench_path=bench_path)
+	f = get_env_cmd("python", bench_path=bench_path)
 	os.chdir(os.path.join(bench_path, "sites"))
 	os.execv(f, [f] + ["-m", "frappe.utils.bench_helper"] + sys.argv[1:])
 
 
 def frappe_cmd(bench_path="."):
-	f = get_env_cmd("python*", bench_path=bench_path)
+	f = get_env_cmd("python", bench_path=bench_path)
 	os.chdir(os.path.join(bench_path, "sites"))
 	os.execv(f, [f] + ["-m", "frappe.utils.bench_helper", "frappe"] + sys.argv[1:])
 
@@ -207,7 +207,7 @@ def get_frappe_commands():
 
 
 def get_frappe_help(bench_path="."):
-	python = get_env_cmd("python*", bench_path=bench_path)
+	python = get_env_cmd("python", bench_path=bench_path)
 	sites_path = os.path.join(bench_path, "sites")
 	try:
 		out = get_cmd_output(

diff --git a/bench/commands/make.py b/bench/commands/make.py
@@ -227,5 +227,5 @@ def pip(ctx, args):
 
 	from bench.utils.bench import get_env_cmd
 
-	env_py = get_env_cmd("python*")
+	env_py = get_env_cmd("python")
 	os.execv(env_py, (env_py, "-m", "pip") + args)
diff --git a/bench/utils/__init__.py b/bench/utils/__init__.py
@@ -231,7 +231,7 @@ def run_frappe_cmd(*args, **kwargs):
 	from bench.utils.bench import get_env_cmd
 
 	bench_path = kwargs.get("bench_path", ".")
-	f = get_env_cmd("python*", bench_path=bench_path)
+	f = get_env_cmd("python", bench_path=bench_path)
 	sites_dir = os.path.join(bench_path, "sites")
 
 	is_async = not from_command_line
@@ -386,7 +386,7 @@ def get_env_frappe_commands(bench_path=".") -> List:
 	"""
 	from bench.utils.bench import get_env_cmd
 
-	python = get_env_cmd("python*", bench_path=bench_path)
+	python = get_env_cmd("python", bench_path=bench_path)
 	sites_path = os.path.join(bench_path, "sites")
 
 	try: