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

Merge pull request #8717 from nonnonstop/fix-installpy

Fix problem of install.py when data-dir is specified
parents 956ed9a7 b9a66b02
Loading
Loading
Loading
Loading
+2 −2
Original line number Original line Diff line number Diff line
@@ -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):
        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():