From 9f898c8d1816ebcea3e7aefb983f8c4ed90a0d55 Mon Sep 17 00:00:00 2001
From: Mathias Kraus <k.hias@gmx.de>
Date: Sun, 30 Jul 2023 17:59:52 +0200
Subject: [PATCH] iox-#68 Make bundled source archive creation more robust

---
 iceoryx-sys/iceoryx-cpp/update-iceoryx-cpp.sh | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/iceoryx-sys/iceoryx-cpp/update-iceoryx-cpp.sh b/iceoryx-sys/iceoryx-cpp/update-iceoryx-cpp.sh
index 676e581..3b314e5 100755
--- a/iceoryx-sys/iceoryx-cpp/update-iceoryx-cpp.sh
+++ b/iceoryx-sys/iceoryx-cpp/update-iceoryx-cpp.sh
@@ -101,7 +101,7 @@ fi
 echo -e "${CYAN}Info:${COLOR_OFF} Extracting new source archive to '${ICEORYX_TAG}'"
 
 mkdir -p ${ICEORYX_TAG}
-tar -xf ${ICEORYX_ARCHIVE} -C ${ICEORYX_TAG} --strip-components=1 --atime-preserve=replace
+tar -xf ${ICEORYX_ARCHIVE} -C ${ICEORYX_TAG} --strip-components=1
 
 #################
 # Strip archive #
@@ -120,17 +120,13 @@ rm -rf ${ICEORYX_TAG}/doc
 rm -rf ${ICEORYX_TAG}/iceoryx_binding_c
 rm -rf ${ICEORYX_TAG}/iceoryx_dds
 rm -rf ${ICEORYX_TAG}/iceoryx_examples
+rm -rf ${ICEORYX_TAG}/iceoryx_hoofs/test
 rm -rf ${ICEORYX_TAG}/iceoryx_integrationtest
 rm -rf ${ICEORYX_TAG}/iceoryx_meta
+rm -rf ${ICEORYX_TAG}/iceoryx_posh/test
 rm -rf ${ICEORYX_TAG}/mkdocs.yml
 rm -rf ${ICEORYX_TAG}/tools
 
-rm -rf ${ICEORYX_TAG}/iceoryx_hoofs/test
-rm -rf ${ICEORYX_TAG}/iceoryx_posh/test
-# restore modified timestamp to prevent changes in archive checksum for repetitive updates to the same tag
-touch -r ${ICEORYX_TAG}/VERSION ${ICEORYX_TAG}/iceoryx_hoofs
-touch -r ${ICEORYX_TAG}/VERSION ${ICEORYX_TAG}/iceoryx_posh
-touch -r ${ICEORYX_TAG}/VERSION ${ICEORYX_TAG}
 
 #######################
 # Re-compress archive #
@@ -138,7 +134,8 @@ touch -r ${ICEORYX_TAG}/VERSION ${ICEORYX_TAG}
 
 echo -e "${CYAN}Info:${COLOR_OFF} Re-compressing '${ICEORYX_TAG}' into '${ICEORYX_ARCHIVE}'"
 
-tar -czf ${ICEORYX_ARCHIVE} ${ICEORYX_TAG}
+# restore modified timestamp to prevent changing the archive for repetitive updates to the same tag
+tar -czf ${ICEORYX_ARCHIVE} ${ICEORYX_TAG} --mtime ./${ICEORYX_TAG}/VERSION
 
 ####################
 # Back to base dir #