diff options
| author | ParityError <36368048+ParityError@users.noreply.github.com> | 2023-03-29 01:29:59 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-29 01:29:59 +0000 |
| commit | f69acfe9a4c09a5c2299e0cc2d5bdcd7a6e62285 (patch) | |
| tree | 01852aeac922029273e08a90c683d63c6fc169cd /modules/paths.py | |
| parent | fb68d93b6a579a424919b22682cf067ce9a8e13f (diff) | |
| parent | 3856ada5cc9ac4124e20ff311ce7aa77330845d9 (diff) | |
| download | stable-diffusion-webui-gfx803-f69acfe9a4c09a5c2299e0cc2d5bdcd7a6e62285.tar.gz stable-diffusion-webui-gfx803-f69acfe9a4c09a5c2299e0cc2d5bdcd7a6e62285.tar.bz2 stable-diffusion-webui-gfx803-f69acfe9a4c09a5c2299e0cc2d5bdcd7a6e62285.zip | |
Merge branch 'AUTOMATIC1111:master' into master
Diffstat (limited to 'modules/paths.py')
| -rw-r--r-- | modules/paths.py | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/modules/paths.py b/modules/paths.py index d991cc71..0e1e00e7 100644 --- a/modules/paths.py +++ b/modules/paths.py @@ -1,16 +1,9 @@ -import argparse
import os
import sys
-import modules.safe
+from modules.paths_internal import models_path, script_path, data_path, extensions_dir, extensions_builtin_dir
-script_path = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
+import modules.safe
-# Parse the --data-dir flag first so we can use it as a base for our other argument default values
-parser = argparse.ArgumentParser(add_help=False)
-parser.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",)
-cmd_opts_pre = parser.parse_known_args()[0]
-data_path = cmd_opts_pre.data_dir
-models_path = os.path.join(data_path, "models")
# data_path = cmd_opts_pre.data
sys.path.insert(0, script_path)
|