Merge branch 'dev' into master

1 files changed, 10 insertions, 2 deletions

diff --git a/modules/paths_internal.py b/modules/paths_internal.py
index 6765bafe..005a9b0a 100644
--- a/modules/paths_internal.py
+++ b/modules/paths_internal.py
@@ -2,8 +2,14 @@
 

 import argparse

 import os

+import sys

+import shlex

 

-script_path = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))

+commandline_args = os.environ.get('COMMANDLINE_ARGS', "")

+sys.argv += shlex.split(commandline_args)

+

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

+script_path = os.path.dirname(modules_path)

 

 sd_configs_path = os.path.join(script_path, "configs")

 sd_default_config = os.path.join(sd_configs_path, "v1-inference.yaml")

@@ -12,7 +18,7 @@ default_sd_model_file = sd_model_file
 

 # Parse the --data-dir flag first so we can use it as a base for our other argument default values

 parser_pre = argparse.ArgumentParser(add_help=False)

-parser_pre.add_argument("--data-dir", type=str, default=os.path.dirname(os.path.dirname(os.path.realpath(__file__))), help="base path where all user data is stored",)

+parser_pre.add_argument("--data-dir", type=str, default=os.path.dirname(modules_path), help="base path where all user data is stored", )

 cmd_opts_pre = parser_pre.parse_known_args()[0]

 

 data_path = cmd_opts_pre.data_dir

@@ -21,3 +27,5 @@ models_path = os.path.join(data_path, "models")
 extensions_dir = os.path.join(data_path, "extensions")

 extensions_builtin_dir = os.path.join(script_path, "extensions-builtin")

 config_states_dir = os.path.join(script_path, "config_states")

+

+roboto_ttf_file = os.path.join(modules_path, 'Roboto-Regular.ttf')