From 48f1e624279e5a0cb1914663d3d3e88982cbf751 Mon Sep 17 00:00:00 2001 From: Yash Tripathi Date: Sun, 23 May 2021 11:03:16 +0530 Subject: bringing back the old method for parsing extra args as config values --- archinstall/__init__.py | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) (limited to 'archinstall/__init__.py') diff --git a/archinstall/__init__.py b/archinstall/__init__.py index ee4748f6..e5fbd95f 100644 --- a/archinstall/__init__.py +++ b/archinstall/__init__.py @@ -32,16 +32,7 @@ def initialize_arguments(): parser.add_argument("--silent", action="store_true", help="Warning!!! No prompts, ignored if config is not passed") parser.add_argument("--script", default="guided", nargs="?", help="Script to run for installation", type=str) - parser.add_argument("--vars", - metavar="KEY=VALUE", - nargs='?', - help="Set a number of key-value pairs " - "(do not put spaces before or after the = sign). " - "If a value contains spaces, you should define " - "it with double quotes: " - 'foo="this is a sentence". Note that ' - "values are always treated as strings.") - args = parser.parse_args() + args, unknowns = parser.parse_known_args() if args.config is not None: try: # First, let's check if this is a URL scheme instead of a filename @@ -57,14 +48,15 @@ def initialize_arguments(): print(e) # Installation can't be silent if config is not passed config["silent"] = args.silent - if args.vars is not None: - try: - for var in args.vars.split(' '): - key, val = var.split("=") - config[key] = val - except Exception as e: - print(e) + for arg in unknowns: + if '--' == arg[:2]: + if '=' in arg: + key, val = [x.strip() for x in arg[2:].split('=', 1)] + else: + key, val = arg[2:], True + config[key] = val config["script"] = args.script + print(config) return config -- cgit v1.2.3-54-g00ecf From 194d45ad2dd9ae0bc051204810cfc5c38a22d33d Mon Sep 17 00:00:00 2001 From: Yash Tripathi Date: Sun, 23 May 2021 11:52:52 +0530 Subject: removed debug code --- archinstall/__init__.py | 1 - 1 file changed, 1 deletion(-) (limited to 'archinstall/__init__.py') diff --git a/archinstall/__init__.py b/archinstall/__init__.py index e5fbd95f..efd3e964 100644 --- a/archinstall/__init__.py +++ b/archinstall/__init__.py @@ -56,7 +56,6 @@ def initialize_arguments(): key, val = arg[2:], True config[key] = val config["script"] = args.script - print(config) return config -- cgit v1.2.3-54-g00ecf