Merge pull request #15705 from AUTOMATIC1111/use-script_path-for-webui-root-in-launch_utils
use script_path for webui root in launch_utils
This commit is contained in:
commit
b9dfc50a1b
|
@ -76,7 +76,7 @@ def git_tag():
|
||||||
except Exception:
|
except Exception:
|
||||||
try:
|
try:
|
||||||
|
|
||||||
changelog_md = os.path.join(os.path.dirname(os.path.dirname(__file__)), "CHANGELOG.md")
|
changelog_md = os.path.join(script_path, "CHANGELOG.md")
|
||||||
with open(changelog_md, "r", encoding="utf-8") as file:
|
with open(changelog_md, "r", encoding="utf-8") as file:
|
||||||
line = next((line.strip() for line in file if line.strip()), "<none>")
|
line = next((line.strip() for line in file if line.strip()), "<none>")
|
||||||
line = line.replace("## ", "")
|
line = line.replace("## ", "")
|
||||||
|
@ -231,7 +231,7 @@ def run_extension_installer(extension_dir):
|
||||||
|
|
||||||
try:
|
try:
|
||||||
env = os.environ.copy()
|
env = os.environ.copy()
|
||||||
env['PYTHONPATH'] = f"{os.path.abspath('.')}{os.pathsep}{env.get('PYTHONPATH', '')}"
|
env['PYTHONPATH'] = f"{script_path}{os.pathsep}{env.get('PYTHONPATH', '')}"
|
||||||
|
|
||||||
stdout = run(f'"{python}" "{path_installer}"', errdesc=f"Error running install.py for extension {extension_dir}", custom_env=env).strip()
|
stdout = run(f'"{python}" "{path_installer}"', errdesc=f"Error running install.py for extension {extension_dir}", custom_env=env).strip()
|
||||||
if stdout:
|
if stdout:
|
||||||
|
|
Loading…
Reference in New Issue