fixup! lint/cubic

diff --git a/tests/system-test-multikey.sh b/tests/system-test-multikey.sh
index ccba68c3e8276550417348b31126c9d959516c6d..213cde6cf960a7fa871970a65983990d748d9018 100755 (executable)
--- a/tests/system-test-multikey.sh
+++ b/tests/system-test-multikey.sh
@@ -85,6 +85,8 @@ export HOME="${tempdir}"
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 repo_root="$(dirname "$SCRIPT_DIR")"
 test_version=$(git describe --tags --always --dirty 2>/dev/null || echo "test")
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 repo_root="$(dirname "$SCRIPT_DIR")"
 test_version=$(git describe --tags --always --dirty 2>/dev/null || echo "test")

+# Escape special chars for sed (delimiter /, &, and backslash)
+test_version=$(printf '%s\n' "$test_version" | sed 's:[&/\]:\\&:g')

 cp "$repo_root/git-remote-gcrypt" "$tempdir/git-remote-gcrypt"
 sed "s/@@DEV_VERSION@@/$test_version/" "$tempdir/git-remote-gcrypt" >"$tempdir/git-remote-gcrypt.tmp"
 mv "$tempdir/git-remote-gcrypt.tmp" "$tempdir/git-remote-gcrypt"
 cp "$repo_root/git-remote-gcrypt" "$tempdir/git-remote-gcrypt"
 sed "s/@@DEV_VERSION@@/$test_version/" "$tempdir/git-remote-gcrypt" >"$tempdir/git-remote-gcrypt.tmp"
 mv "$tempdir/git-remote-gcrypt.tmp" "$tempdir/git-remote-gcrypt"

diff --git a/tests/system-test-privacy-leaks.sh b/tests/system-test-privacy-leaks.sh
index 5df0d8f1ae885ca15d27a65a2ec1bdb25168c391..5e0c0991f4a9a4d5d0c95880aa7df425988c4459 100755 (executable)
--- a/tests/system-test-privacy-leaks.sh
+++ b/tests/system-test-privacy-leaks.sh
@@ -18,6 +18,8 @@ export HOME="${tempdir}"
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 repo_root="$(dirname "$SCRIPT_DIR")"
 test_version=$(git describe --tags --always --dirty 2>/dev/null || echo "test")
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 repo_root="$(dirname "$SCRIPT_DIR")"
 test_version=$(git describe --tags --always --dirty 2>/dev/null || echo "test")

+# Escape special chars for sed (delimiter /, &, and backslash)
+test_version=$(printf '%s\n' "$test_version" | sed 's:[&/\]:\\&:g')

 cp "$repo_root/git-remote-gcrypt" "$tempdir/git-remote-gcrypt"
 sed "s/@@DEV_VERSION@@/$test_version/" "$tempdir/git-remote-gcrypt" >"$tempdir/git-remote-gcrypt.tmp"
 mv "$tempdir/git-remote-gcrypt.tmp" "$tempdir/git-remote-gcrypt"
 cp "$repo_root/git-remote-gcrypt" "$tempdir/git-remote-gcrypt"
 sed "s/@@DEV_VERSION@@/$test_version/" "$tempdir/git-remote-gcrypt" >"$tempdir/git-remote-gcrypt.tmp"
 mv "$tempdir/git-remote-gcrypt.tmp" "$tempdir/git-remote-gcrypt"

diff --git a/tests/system-test-repack.sh b/tests/system-test-repack.sh
index db176a60669d1f844791451a9ba6d9f5336800c3..72f8c896a11db3a630d04fe9155ff5b7d8a5b119 100755 (executable)
--- a/tests/system-test-repack.sh
+++ b/tests/system-test-repack.sh
@@ -50,6 +50,8 @@ export HOME="${tempdir}"
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 repo_root="$(dirname "$SCRIPT_DIR")"
 test_version=$(git describe --tags --always --dirty 2>/dev/null || echo "test")
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 repo_root="$(dirname "$SCRIPT_DIR")"
 test_version=$(git describe --tags --always --dirty 2>/dev/null || echo "test")

+# Escape special chars for sed (delimiter /, &, and backslash)
+test_version=$(printf '%s\n' "$test_version" | sed 's:[&/\]:\\&:g')

 cp "$repo_root/git-remote-gcrypt" "$tempdir/git-remote-gcrypt"
 sed -i "s/@@DEV_VERSION@@/$test_version/" "$tempdir/git-remote-gcrypt"
 chmod +x "$tempdir/git-remote-gcrypt"
 cp "$repo_root/git-remote-gcrypt" "$tempdir/git-remote-gcrypt"
 sed -i "s/@@DEV_VERSION@@/$test_version/" "$tempdir/git-remote-gcrypt"
 chmod +x "$tempdir/git-remote-gcrypt"

diff --git a/tests/system-test.sh b/tests/system-test.sh
index d5471d74b2826a9240f55e56f6d654a0e0ca4445..11c763c1fa7ca311aabb793a54ec94f0551a17f4 100755 (executable)
--- a/tests/system-test.sh
+++ b/tests/system-test.sh
@@ -77,6 +77,8 @@ export HOME="${tempdir}"
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 repo_root="$(dirname "$SCRIPT_DIR")"
 test_version=$(git describe --tags --always --dirty 2>/dev/null || echo "test")
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 repo_root="$(dirname "$SCRIPT_DIR")"
 test_version=$(git describe --tags --always --dirty 2>/dev/null || echo "test")

+# Escape special chars for sed (delimiter /, &, and backslash)
+test_version=$(printf '%s\n' "$test_version" | sed 's:[&/\]:\\&:g')

 cp "$repo_root/git-remote-gcrypt" "$tempdir/git-remote-gcrypt"
 sed "s/@@DEV_VERSION@@/$test_version/" "$tempdir/git-remote-gcrypt" > "$tempdir/git-remote-gcrypt.tmp"
 mv "$tempdir/git-remote-gcrypt.tmp" "$tempdir/git-remote-gcrypt"
 cp "$repo_root/git-remote-gcrypt" "$tempdir/git-remote-gcrypt"
 sed "s/@@DEV_VERSION@@/$test_version/" "$tempdir/git-remote-gcrypt" > "$tempdir/git-remote-gcrypt.tmp"
 mv "$tempdir/git-remote-gcrypt.tmp" "$tempdir/git-remote-gcrypt"