From de9130267d60b92ac363e5b1613a09232c56c722 Mon Sep 17 00:00:00 2001
From: Rosy-Glorious Miki <rmiki@redhat.com>
Date: Wed, 29 Apr 2026 10:07:52 -0400
Subject: [PATCH] test: replace tar alias with shell function for macOS
 compatibility

Signed-off-by: Rosy-Glorious Miki <rmiki@redhat.com>
---
 tests/test-multi-old.sh | 4 ++--
 tests/utils.sh          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/test-multi-old.sh b/tests/test-multi-old.sh
index 03a8011..390ffb9 100755
--- a/tests/test-multi-old.sh
+++ b/tests/test-multi-old.sh
@@ -47,8 +47,8 @@ modify_orig "$TEST_DIR/modified" "$TEST_DIR/orig.tar"
 create_tar "$TEST_DIR/modified.tar" "$TEST_DIR/modified"
 
 # old1: full tree minus every peeled file
-cp -dR --no-preserve=context "$TEST_DIR/orig" "$TEST_DIR/mo-base" 2>/dev/null \
-	|| cp -dR "$TEST_DIR/orig" "$TEST_DIR/mo-base"
+cp -RP --no-preserve=context "$TEST_DIR/orig" "$TEST_DIR/mo-base" 2>/dev/null \
+	|| cp -RP "$TEST_DIR/orig" "$TEST_DIR/mo-base"
 for rel in "${PEEL[@]}"; do
 	rm -f "$TEST_DIR/mo-base/data/$rel"
 done
diff --git a/tests/utils.sh b/tests/utils.sh
index ddda09b..3c9a094 100755
--- a/tests/utils.sh
+++ b/tests/utils.sh
@@ -5,8 +5,8 @@
 
 use_gnu_tar_if_available() {
     if command -v gtar &>/dev/null; then
-        shopt -s expand_aliases
-        alias tar=gtar
+        tar() { gtar "$@"; }
+        export -f tar
     fi
     return 0
 }