db-sync-tool-kmi 2.11.9__tar.gz → 2.11.10__tar.gz

{db_sync_tool_kmi-2.11.9/db_sync_tool_kmi.egg-info → db_sync_tool_kmi-2.11.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: db_sync_tool-kmi
-Version: 2.11.9
+Version: 2.11.10
 Summary: Synchronize a database from and to host systems.
 Home-page: https://github.com/jackd248/db-sync-tool
 Author: Konrad Michalik

{db_sync_tool_kmi-2.11.9 → db_sync_tool_kmi-2.11.10}/db_sync_tool/info.py

@@ -1,6 +1,6 @@
 """
 Info script
 """
-__version__ = "2.11.9"
+__version__ = "2.11.10"
 __pypi_package_url__ = "https://pypi.org/pypi/db-sync-tool-kmi"
 __homepage__ = "https://github.com/jackd248/db-sync-tool"

{db_sync_tool_kmi-2.11.9 → db_sync_tool_kmi-2.11.10}/db_sync_tool/recipes/typo3.py

@@ -96,12 +96,7 @@ def get_database_setting_from_additional_configuration(client, name, file):
     :param file: String
     :return:
     """
-    return mode.run_command(
-        helper.get_command(client, 'sed') +
-        f' -nE "s/\'{name}\'.*=>.*\'(.*)\'.*$/\\1/p" {file}',
-        client,
-        True
-    ).replace('\n', '').strip()
+    return helper.run_sed_command(client, f'"s/\'{name}\'.*=>.*\'(.*)\'.*$/\\1/p" {file}')
 
 def get_database_setting_from_env(client, name, file):
     """
@@ -112,9 +107,4 @@ def get_database_setting_from_env(client, name, file):
     :param file: String
     :return:
     """
-    return mode.run_command(
-        helper.get_command(client, 'sed') +
-        f' -nE "s/{name}=(.*).*$/\\1/p" {file}',
-        client,
-        True
-    ).replace('\n', '').strip()
+    return helper.run_sed_command(client, f'"s/{name}=(.*).*$/\\1/p" {file}')

{db_sync_tool_kmi-2.11.9 → db_sync_tool_kmi-2.11.10}/db_sync_tool/utility/helper.py

@@ -351,3 +351,28 @@ def remove_surrounding_quotes(s):
         elif s.startswith("'") and s.endswith("'"):
             return s[1:-1]
     return s
+
+
+def run_sed_command(client, command):
+    """
+    Executes a sed command on the specified client, trying -E first and falling back to -r if -E fails.
+
+    :param client: The client on which the sed command should be executed.
+    :param command: The sed command to execute (excluding the sed options).
+    :return: The result of the sed command as a cleaned string (with newlines removed).
+    """
+    # Check if the client supports -E or -r option for sed
+    option = mode.run_command(
+         f"echo | {get_command(client, 'sed')} -E '' >/dev/null 2>&1 && echo -E || (echo | {get_command(client, 'sed')} -r '' >/dev/null 2>&1 && echo -r)",
+         client,
+         True
+    )
+    # If neither option is supported, default to -E
+    if option == '':
+        option = '-E'
+
+    return mode.run_command(
+        f"{get_command(client, 'sed')} -n {option} {command}",
+        client,
+        True
+    ).strip().replace('\n', '')

{db_sync_tool_kmi-2.11.9 → db_sync_tool_kmi-2.11.10/db_sync_tool_kmi.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: db_sync_tool-kmi
-Version: 2.11.9
+Version: 2.11.10
 Summary: Synchronize a database from and to host systems.
 Home-page: https://github.com/jackd248/db-sync-tool
 Author: Konrad Michalik