From 9769842d0b8bf1fa7fa1135b686d2c7ba08eb73f Mon Sep 17 00:00:00 2001 From: Ivan Belyakov Date: Wed, 11 Jun 2025 12:55:49 +0200 Subject: [PATCH] fix: remove dpkg dependency in kurtosis-helpers for cross-platform compatibility. Fix case insensistive comparison for bash version < 4.0 --- core/helpers/scripts/aggkit_bridge_service.bash | 2 +- core/helpers/scripts/kurtosis-helpers.bash | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/helpers/scripts/aggkit_bridge_service.bash b/core/helpers/scripts/aggkit_bridge_service.bash index 7d47b1e85..2de711b33 100644 --- a/core/helpers/scripts/aggkit_bridge_service.bash +++ b/core/helpers/scripts/aggkit_bridge_service.bash @@ -250,7 +250,7 @@ function wait_for_expected_token() { echo "Attempt $attempt: found origin_token_address = $origin_token_address (Expected: $expected_origin_token), network id=$network_id" >&3 # Break loop if the expected token is found (case-insensitive) - if [[ "${origin_token_address,,}" == "${expected_origin_token,,}" ]]; then + if [[ "$(echo "$origin_token_address" | tr '[:upper:]' '[:lower:]')" == "$(echo "$expected_origin_token" | tr '[:upper:]' '[:lower:]')" ]]; then echo "Success: Expected origin_token_address '$expected_origin_token' found. Exiting loop." >&3 echo "$token_mappings_result" return 0 diff --git a/core/helpers/scripts/kurtosis-helpers.bash b/core/helpers/scripts/kurtosis-helpers.bash index ad67052bc..d4cdde3e3 100644 --- a/core/helpers/scripts/kurtosis-helpers.bash +++ b/core/helpers/scripts/kurtosis-helpers.bash @@ -12,10 +12,10 @@ function kurtosis_download_file_exec_method() { } function kurtosis_filer_exec_method() { - local _kurtosis_version=$(kurtosis version | cut -d ':' -f 2 | head -n 1) + local _kurtosis_version=$(kurtosis version | cut -d ':' -f 2 | head -n 1 | xargs) # versions previous 1.7.0 first line in stdout is # "The command was successfully executed and returned '0'." # After this version this line is output in stderr # So if kurtosis version is <1.7.0 need tail -n +2, if not just same output - dpkg --compare-versions "$_kurtosis_version" "ge" "1.7.0" && cat || tail -n +2 + printf "1.7.0\n$_kurtosis_version" | sort -V -C && cat || tail -n +2 }