Commit 681c16dd authored by w-e-w's avatar w-e-w
Browse files

fix --data-dir for COMMANDLINE_ARGS

move reading of COMMANDLINE_ARGS into paths_internal.py so --data-dir can be properly read
parent abe32cef
Loading
Loading
Loading
Loading
+0 −4
Original line number Original line Diff line number Diff line
@@ -3,16 +3,12 @@ import subprocess
import os
import os
import sys
import sys
import importlib.util
import importlib.util
import shlex
import platform
import platform
import json
import json


from modules import cmd_args
from modules import cmd_args
from modules.paths_internal import script_path, extensions_dir
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()
args, _ = cmd_args.parser.parse_known_args()


python = sys.executable
python = sys.executable
+5 −0
Original line number Original line Diff line number Diff line
@@ -2,6 +2,11 @@


import argparse
import argparse
import os
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__))
modules_path = os.path.dirname(os.path.realpath(__file__))
script_path = os.path.dirname(modules_path)
script_path = os.path.dirname(modules_path)