StableDiffusion/WebUI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10384 from akx/no-shell

Browse Source 
launch.py: Don't involve shell for running Python or getting Git output
This commit is contained in:
AUTOMATIC1111 2023-05-14 21:18:09 +03:00 committed by GitHub
commit d7d378eda1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
launch.py
View File

@ -58,7 +58,7 @@ Use --skip-python-version-check to suppress this warning.
@lru_cache() @lru_cache()
def commit_hash(): def commit_hash():
try: try:
return subprocess.check_output(f"{git} rev-parse HEAD", encoding='utf8').strip() return subprocess.check_output([git, "rev-parse", "HEAD"], shell=False, encoding='utf8').strip()
except Exception: except Exception:
return "<none>" return "<none>"
@ -66,7 +66,7 @@ def commit_hash():
@lru_cache() @lru_cache()
def git_tag(): def git_tag():
try: try:
return subprocess.check_output(f"{git} describe --tags", encoding='utf8').strip() return subprocess.check_output([git, "describe", "--tags"], shell=False, encoding='utf8').strip()
except Exception: except Exception:
return "<none>" return "<none>"
@ -125,7 +125,7 @@ def run_pip(command, desc=None, live=default_command_live):
def check_run_python(code: str) -> bool: def check_run_python(code: str) -> bool:
result = subprocess.run([python, "-c", code], capture_output=True, shell=True) result = subprocess.run([python, "-c", code], capture_output=True, shell=False)
return result.returncode == 0 return result.returncode == 0