Commit 70615448 authored by AUTOMATIC1111's avatar AUTOMATIC1111 Committed by GitHub

Merge pull request #8717 from nonnonstop/fix-installpy

Fix problem of install.py when data-dir is specified
parents 956ed9a7 b9a66b02
...@@ -14,7 +14,7 @@ parser.add_argument("--data-dir", type=str, default=os.path.dirname(os.path.real ...@@ -14,7 +14,7 @@ parser.add_argument("--data-dir", type=str, default=os.path.dirname(os.path.real
args, _ = parser.parse_known_args(sys.argv) args, _ = parser.parse_known_args(sys.argv)
script_path = os.path.dirname(__file__) script_path = os.path.dirname(__file__)
data_path = os.getcwd() data_path = args.data_dir
dir_repos = "repositories" dir_repos = "repositories"
dir_extensions = "extensions" dir_extensions = "extensions"
...@@ -231,7 +231,7 @@ def run_extensions_installers(settings_file): ...@@ -231,7 +231,7 @@ def run_extensions_installers(settings_file):
return return
for dirname_extension in list_extensions(settings_file): for dirname_extension in list_extensions(settings_file):
run_extension_installer(os.path.join(dir_extensions, dirname_extension)) run_extension_installer(os.path.join(data_path, dir_extensions, dirname_extension))
def prepare_environment(): def prepare_environment():
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment