Unverified Commit b20cd352 authored by AUTOMATIC1111's avatar AUTOMATIC1111 Committed by GitHub
Browse files

Merge pull request #13210 from AUTOMATIC1111/fetch-version-info-when-webui_dir-is-not-work_dir- 

fix issues when webui_dir is not work_dir
parents 3a4290f8 5b761b49

modules/launch_utils.py

+2 −2
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ Use --skip-python-version-check to suppress this warning. 
@lru_cache()

def commit_hash():

    try:

        return subprocess.check_output([git, "rev-parse", "HEAD"], shell=False, encoding='utf8').strip()

        return subprocess.check_output([git, "-C", script_path, "rev-parse", "HEAD"], shell=False, encoding='utf8').strip()

    except Exception:

        return "<none>"
@@ -72,7 +72,7 @@ def commit_hash(): 
@lru_cache()

def git_tag():

    try:

        return subprocess.check_output([git, "describe", "--tags"], shell=False, encoding='utf8').strip()

        return subprocess.check_output([git, "-C", script_path, "describe", "--tags"], shell=False, encoding='utf8').strip()

    except Exception:

        try:

modules/paths.py

+1 −1
Original line number Diff line number Diff line 
import os

import sys

from modules.paths_internal import models_path, script_path, data_path, extensions_dir, extensions_builtin_dir  # noqa: F401

from modules.paths_internal import models_path, script_path, data_path, extensions_dir, extensions_builtin_dir, cwd  # noqa: F401



import modules.safe  # noqa: F401

modules/paths_internal.py

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ import shlex 
commandline_args = os.environ.get('COMMANDLINE_ARGS', "")

sys.argv += shlex.split(commandline_args)



cwd = os.getcwd()

modules_path = os.path.dirname(os.path.realpath(__file__))

script_path = os.path.dirname(modules_path)

modules/ui_gradio_extensions.py

+3 −3
Original line number Diff line number Diff line
@@ -2,12 +2,12 @@ import os 
import gradio as gr



from modules import localization, shared, scripts

from modules.paths import script_path, data_path

from modules.paths import script_path, data_path, cwd





def webpath(fn):

    if fn.startswith(script_path):

        web_path = os.path.relpath(fn, script_path).replace('\\', '/')

    if fn.startswith(cwd):

        web_path = os.path.relpath(fn, cwd)

    else:

        web_path = os.path.abspath(fn)

CRA Git | Maintained and supported by SUSTech CRA and CCSE