Merge pull request #10317 from AUTOMATIC1111/fix-COMMANDLINE_ARGS--data-dir

fix --data-dir ignored when launching via webui-user.bat COMMANDLINE_ARGS

2 files changed, 5 insertions, 4 deletions

diff --git a/launch.py b/launch.py
index 62b33f14..516746ac 100644
--- a/launch.py
+++ b/launch.py
@@ -3,16 +3,12 @@ import subprocess
 import os

 import sys

 import importlib.util

-import shlex

 import platform

 import json

 

 from modules import cmd_args

 from modules.paths_internal import script_path, extensions_dir

 

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

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

-

 args, _ = cmd_args.parser.parse_known_args()

 

 python = sys.executable

diff --git a/modules/paths_internal.py b/modules/paths_internal.py
index a23f6d70..005a9b0a 100644
--- a/modules/paths_internal.py
+++ b/modules/paths_internal.py
@@ -2,6 +2,11 @@
 

 import argparse

 import os

+import sys

+import shlex

+

+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)