From 49b3264b0e8dc23a145fcc0fee8036fdc43eb639 Mon Sep 17 00:00:00 2001 From: jwinterm Date: Sat, 29 Aug 2026 14:38:24 -0400 Subject: [PATCH] =?UTF-8?q?cmake:=20portable=20tor/wownerod=20copies=20?= =?UTF-8?q?=E2=80=94=20BSD=20cp=20lacks=20-u=20(exit=2064=20evaded=20the?= =?UTF-8?q?=20ret=3D=3D1=20check,=20silently=20shipping=20without=20embedd?= =?UTF-8?q?ed=20node/tor);=20fail=20on=20ANY=20nonzero=20cp=20exit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 101fe0ec..a110f935 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -156,11 +156,11 @@ if(TOR_DIR) if (REPRODUCIBLE) set(TOR_COPY_CMD "cp -a ${TOR_DIR}/* ${CMAKE_CURRENT_SOURCE_DIR}/src/assets/tor") else() - set(TOR_COPY_CMD "cp -au ${TOR_DIR}/* ${CMAKE_CURRENT_SOURCE_DIR}/src/assets/tor") + set(TOR_COPY_CMD "cp -a ${TOR_DIR}/* ${CMAKE_CURRENT_SOURCE_DIR}/src/assets/tor") # wowlet: BSD cp has no -u (macOS: illegal option, exit 64, silent no-op) endif() execute_process(COMMAND bash -c "${TOR_COPY_CMD}" RESULT_VARIABLE ret) - if(ret EQUAL "1") + if(NOT ret EQUAL "0") message(FATAL_ERROR "Tor copy failure: ${TOR_COPY_CMD}") endif() @@ -176,11 +176,11 @@ if(WOWNEROD_DIR) if (REPRODUCIBLE) set(WOWNEROD_COPY_CMD "cp -a ${WOWNEROD_DIR}/* ${CMAKE_CURRENT_SOURCE_DIR}/src/assets/wownerod") else() - set(WOWNEROD_COPY_CMD "cp -au ${WOWNEROD_DIR}/* ${CMAKE_CURRENT_SOURCE_DIR}/src/assets/wownerod") + set(WOWNEROD_COPY_CMD "cp -a ${WOWNEROD_DIR}/* ${CMAKE_CURRENT_SOURCE_DIR}/src/assets/wownerod") # wowlet: BSD cp has no -u endif() execute_process(COMMAND bash -c "${WOWNEROD_COPY_CMD}" RESULT_VARIABLE ret) - if(ret EQUAL "1") + if(NOT ret EQUAL "0") message(FATAL_ERROR "wownerod copy failure: ${WOWNEROD_COPY_CMD}") endif()