db-sync-tool-kmi 2.11.9__py3-none-any.whl → 2.11.11__py3-none-any.whl

db_sync_tool/info.py

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

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/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/utility/mode.py

@@ -145,7 +145,7 @@ class SyncMode:
 
         :return: boolean
         """
-        return SyncMode.is_same_configuration('host') and SyncMode.is_same_configuration('port')
+        return SyncMode.is_same_configuration('host') and SyncMode.is_same_configuration('port') and SyncMode.is_same_configuration('user')
 
     @staticmethod
     def is_available_configuration(key):

{db_sync_tool_kmi-2.11.9.dist-info → db_sync_tool_kmi-2.11.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: db_sync_tool-kmi
-Version: 2.11.9
+Version: 2.11.11
 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.dist-info → db_sync_tool_kmi-2.11.11.dist-info}/RECORD

@@ -1,6 +1,6 @@
 db_sync_tool/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 db_sync_tool/__main__.py,sha256=-pD13j2oYcKLhPprLy-LQeDCapj-FKrV3CDFHuYJu3g,11541
-db_sync_tool/info.py,sha256=lQSxNR2x67MTkUq0QcILVpQ7TTKZeUbjVY-U0Ws_skk,165
+db_sync_tool/info.py,sha256=JIaORX73FkfwAe5aOfqF_7rRSl_w_Jp346ZX2jTUt2I,166
 db_sync_tool/sync.py,sha256=WMfMts0M8z3oecI-HL07xG9ktbba8D8h7_U-8tBwizY,2087
 db_sync_tool/database/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 db_sync_tool/database/process.py,sha256=djOnNnwEswkmPbnJVsI3SvPSwzcZgAapighh3Ew5heE,8069
@@ -9,7 +9,7 @@ db_sync_tool/recipes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 db_sync_tool/recipes/drupal.py,sha256=jAo1d3vxZ4UZ4Vzk308Dsmn1--ORmVO2g87l8OpQoPw,1505
 db_sync_tool/recipes/laravel.py,sha256=kp_gnKG0iyX_rzM0GW7Ca9ZPV3oGfEgGsLvJR_0pVDo,1175
 db_sync_tool/recipes/symfony.py,sha256=8ObIRXdoBG1MbWD7pd1TxUQboz5LUWbfzz3TX6F9G5w,2517
-db_sync_tool/recipes/typo3.py,sha256=6KLOgetCRe7cY60p0KqsP9Rq2DKRZVfnna4onritfy4,5067
+db_sync_tool/recipes/typo3.py,sha256=6vTulkViqbx_4ZyJV5kAHbSqifJK82uRKUTwRI5SqhU,4857
 db_sync_tool/recipes/wordpress.py,sha256=KN3HTzDbs5p2GD7vvTEhBl7xNOiy2YHrXhVLmiF_y_A,1468
 db_sync_tool/remote/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 db_sync_tool/remote/client.py,sha256=wjcoQ1jp9i8PMO_6XX2XMXZCoLXy-ySA38seZtY-Sns,6553
@@ -18,17 +18,17 @@ db_sync_tool/remote/system.py,sha256=A9OIaypETMYx7frTKpXBgja-kXj7vSD6gJs8pUNpL_I
 db_sync_tool/remote/transfer.py,sha256=pYVsad4SKkJ0TgZHcyLc17Z9xK6exdyO7R8TBe4qQcQ,5872
 db_sync_tool/remote/utility.py,sha256=knTfzFKLdw2QsirvTfTz76XmckagKURKVBhjyREsQIo,3580
 db_sync_tool/utility/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-db_sync_tool/utility/helper.py,sha256=zf1dPKgb5loLcOUtinjHdY9D_E6Gp5kLjbS8R-bRrxw,8905
+db_sync_tool/utility/helper.py,sha256=--bUFgvLhHutqS__1B8nTZKjFnLZ0H8ZSmfnGlUy7n8,9837
 db_sync_tool/utility/info.py,sha256=8VdUMi3fsyykfMKKrmgUVoW9WEHPXbzPkVNHOIsNAMo,2976
 db_sync_tool/utility/log.py,sha256=OdJsVKyvJqQYl5NUzb5bIg1uhUJ9kj7c7kT9oKbGvo8,869
-db_sync_tool/utility/mode.py,sha256=DAkt-N5sYr6r2iTL_1sWu7_WHq04DNO4YjvBLkU3LeA,8588
+db_sync_tool/utility/mode.py,sha256=ibhV2cSY5VjA-kH1Pkk7VXlqNiFkv4IVeKRDNAtd09k,8631
 db_sync_tool/utility/output.py,sha256=uoiWE7Pm8qv1a3vrBupZHE545d1uZSQHiLAUgkHofLM,4758
 db_sync_tool/utility/parser.py,sha256=DIdWVGyiltyH8akoWyyXLvUmFPR-nvBrnzDctPJzgKw,6624
 db_sync_tool/utility/system.py,sha256=G74lWGFcJNmLr0l6-GkZWmkk7q3icv4MccuHFKP_Vsw,18539
 db_sync_tool/utility/validation.py,sha256=qZNPgkTwV_kJTNtFh0OXb2FHrsWPnDA2W_fftWs5hZc,3530
-db_sync_tool_kmi-2.11.9.dist-info/licenses/LICENSE,sha256=o_R9gPKBRl4PQVcGCrWuTYsJQJ7uuQDcDaq-wapBUaw,1082
-db_sync_tool_kmi-2.11.9.dist-info/METADATA,sha256=CYfLbv50QzlHvm2Z81LWcGqux7iu4VtyCUpFaXL6D0M,12876
-db_sync_tool_kmi-2.11.9.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-db_sync_tool_kmi-2.11.9.dist-info/entry_points.txt,sha256=bVk6UR_ejpfY2oSCoOii7uKQivwV9MtA6Tdqpjg4Yvo,60
-db_sync_tool_kmi-2.11.9.dist-info/top_level.txt,sha256=Uj5hJLhmdynFrBE0VnX0PfgIBC8_n7h2vgldqUQ-xfw,13
-db_sync_tool_kmi-2.11.9.dist-info/RECORD,,
+db_sync_tool_kmi-2.11.11.dist-info/licenses/LICENSE,sha256=o_R9gPKBRl4PQVcGCrWuTYsJQJ7uuQDcDaq-wapBUaw,1082
+db_sync_tool_kmi-2.11.11.dist-info/METADATA,sha256=PdStOCtb9DUHk1A6g0lTAvPzBsAoE5Crch7W96RMuUg,12877
+db_sync_tool_kmi-2.11.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+db_sync_tool_kmi-2.11.11.dist-info/entry_points.txt,sha256=bVk6UR_ejpfY2oSCoOii7uKQivwV9MtA6Tdqpjg4Yvo,60
+db_sync_tool_kmi-2.11.11.dist-info/top_level.txt,sha256=Uj5hJLhmdynFrBE0VnX0PfgIBC8_n7h2vgldqUQ-xfw,13
+db_sync_tool_kmi-2.11.11.dist-info/RECORD,,

{db_sync_tool_kmi-2.11.9.dist-info → db_sync_tool_kmi-2.11.11.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any