From b83b9229a9fdedb19735d13b3f518c9f513f2aca Mon Sep 17 00:00:00 2001
From: Fabian Arndt <fabian.arndt@root-core.net>
Date: Thu, 28 Mar 2024 21:22:38 +0100
Subject: [PATCH] Refactored replace_command()

- Allow case insensitive matching
- Returns if there was a match
- Logging respects if there was a match
---
 util.py | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/util.py b/util.py
index 09df5f7c..a7c1577c 100755
--- a/util.py
+++ b/util.py
@@ -335,14 +335,28 @@ def regedit_add(folder,name=None,type=None,value=None,arch=None):
     process = subprocess.Popen(regedit_cmd, env=env)
     process.wait()
 
-def replace_command(orig_str, repl_str):
+
+def replace_command(orig: str, repl: str, match_flags: re.RegexFlag = re.IGNORECASE) -> bool:
     """ Make a commandline replacement in sys.argv
-    """
+        Returns if there was any match.
 
-    log.info('Changing ' + orig_str + ' to ' + repl_str)
+        By default the search is case insensitive,
+        you can override this behaviour with re.RegexFlag.NOFLAG
+    """
+    found = False
     for idx, arg in enumerate(sys.argv):
-        if orig_str in arg:
-            sys.argv[idx] = arg.replace(orig_str, repl_str)
+        replaced = re.sub(orig, repl, arg, flags=match_flags)
+        if replaced == arg:
+            continue
+        sys.argv[idx] = replaced
+        found = True
+
+    if found:
+        log.info(f'Changed "{orig}" -> "{repl}"')
+    else:
+        log.warn(f'Can not change "{orig}" -> "{repl}", command not found')
+    return found
+
 
 def append_argument(argument):
     """ Append an argument to sys.argv