From 296f82629a850d1cf3aea85c77cf3b68c264d9ea Mon Sep 17 00:00:00 2001
From: Bart Thomee <11445373+bthomee@users.noreply.github.com>
Date: Thu, 30 Oct 2025 15:57:20 -0400
Subject: [PATCH] Handle rerunning of the script

---
 .github/scripts/rename/cmake.sh | 45 ++++++++++++++++++++++-----------
 cmake/XrplCore.cmake            |  1 +
 cmake/XrplValidatorKeys.cmake   |  2 +-
 3 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/.github/scripts/rename/cmake.sh b/.github/scripts/rename/cmake.sh
index 947e9ac563..09cac6ea52 100755
--- a/.github/scripts/rename/cmake.sh
+++ b/.github/scripts/rename/cmake.sh
@@ -4,7 +4,7 @@
 set -e
 
 # On MacOS, ensure that GNU sed and head are installed and available as `gsed`
-# and `ghead`, respectively.
+# and `ghead`, respectively, and that rename is available.
 SED_COMMAND=sed
 HEAD_COMMAND=head
 if [[ "$OSTYPE" == "darwin"* ]]; then
@@ -18,6 +18,10 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
       exit 1
   fi
   HEAD_COMMAND=ghead
+  if ! command -v rename &> /dev/null; then
+      echo "Error: rename is not installed. Please install it using 'brew install rename'."
+      exit 1
+  fi
 fi
 
 # This script renames CMake files from `RippleXXX.cmake` or `RippledXXX.cmake`
@@ -40,12 +44,14 @@ if [ ! -d "${DIRECTORY}" ]; then
 fi
 
 # Rename the files.
-for FILE in ${DIRECTORY}/cmake/Ripple*.cmake; do
-  echo "${FILE}"
-  mv "${FILE}" "$(echo "${FILE}" | ${SED_COMMAND} -E 's/Rippled?/Xrpl/')"
-done
-mv ${DIRECTORY}/cmake/xrpl_add_test.cmake ${DIRECTORY}/cmake/XrplAddTest.cmake
-mv ${DIRECTORY}/include/xrpl/proto/ripple.proto ${DIRECTORY}/include/xrpl/proto/xrpl.proto
+rename 's/Rippled/Xrpl/g' ${DIRECTORY}/cmake/*.cmake
+rename 's/Ripple/Xrpl/g' ${DIRECTORY}/cmake/*.cmake
+if [ -e "${DIRECTORY}/cmake/xrpl_add_test.cmake" ]; then
+  mv "${DIRECTORY}/cmake/xrpl_add_test.cmake" "${DIRECTORY}/cmake/XrplAddTest.cmake"
+fi
+if [ -e "${DIRECTORY}/include/xrpl/proto/ripple.proto" ]; then
+  mv "${DIRECTORY}/include/xrpl/proto/ripple.proto" "${DIRECTORY}/include/xrpl/proto/xrpl.proto"
+fi
 
 # Rename inside the files.
 find "${DIRECTORY}/cmake" -type f -name "*.cmake" | while read -r FILE; do
@@ -57,15 +63,24 @@ find "${DIRECTORY}/cmake" -type f -name "*.cmake" | while read -r FILE; do
 done
 ${SED_COMMAND} -i -E 's/Rippled?/Xrpl/g' "${DIRECTORY}/CMakeLists.txt"
 ${SED_COMMAND} -i 's/ripple/xrpl/g' "${DIRECTORY}/CMakeLists.txt"
-${SED_COMMAND} -i 's/include(xrpl_add_test)/include(XrplAddTest)/g' "${DIRECTORY}/src/tests/libxrpl/CMakeLists.txt"
-${SED_COMMAND} -i 's/ripple.pb.h/xrpl.pb.h/g' "${DIRECTORY}/include/xrpl/protocol/messages.h"
-${SED_COMMAND} -i 's/ripple.pb.h/xrpl.pb.h/g' "${DIRECTORY}/BUILD.md"
+${SED_COMMAND} -i 's/include(xrpl_add_test)/include(XrplAddTest)/' "${DIRECTORY}/src/tests/libxrpl/CMakeLists.txt"
+${SED_COMMAND} -i 's/ripple.pb.h/xrpl.pb.h/' "${DIRECTORY}/include/xrpl/protocol/messages.h"
+${SED_COMMAND} -i 's/ripple.pb.h/xrpl.pb.h/' "${DIRECTORY}/BUILD.md"
+
+# Restore the name of the validator keys repository.
+${SED_COMMAND} -i 's@xrpl/validator-keys-tool@ripple/validator-keys-tool@' "${DIRECTORY}/cmake/XrplValidatorKeys.cmake"
 
 # Ensure the name of the binary remains 'rippled' for now.
-ghead -n -2 "${DIRECTORY}/cmake/XrplCore.cmake" > cmake.tmp
-echo '  # For the time being, we will keep the name of the binary as it was.' >> cmake.tmp
-echo '  set_target_properties(xrpld PROPERTIES OUTPUT_NAME "rippled")' >> cmake.tmp
-tail -2 "${DIRECTORY}/cmake/XrplCore.cmake" >> cmake.tmp
-mv cmake.tmp "${DIRECTORY}/cmake/XrplCore.cmake"
+if grep -q '"xrpld"' "${DIRECTORY}/cmake/XrplCore.cmake"; then
+  # The script has been rerun, so just restore the name of the binary.
+  ${SED_COMMAND} -i 's/"xrpld"/"rippled"/' "${DIRECTORY}/cmake/XrplCore.cmake"
+elif ! grep -q '"rippled"' "${DIRECTORY}/cmake/XrplCore.cmake"; then
+  ghead -n -2 "${DIRECTORY}/cmake/XrplCore.cmake" > cmake.tmp
+  echo ''
+  echo '  # For the time being, we will keep the name of the binary as it was.' >> cmake.tmp
+  echo '  set_target_properties(xrpld PROPERTIES OUTPUT_NAME "rippled")' >> cmake.tmp
+  tail -2 "${DIRECTORY}/cmake/XrplCore.cmake" >> cmake.tmp
+  mv cmake.tmp "${DIRECTORY}/cmake/XrplCore.cmake"
+fi
 
 echo "Renaming complete."
diff --git a/cmake/XrplCore.cmake b/cmake/XrplCore.cmake
index e33139dd3b..d546a96cf8 100644
--- a/cmake/XrplCore.cmake
+++ b/cmake/XrplCore.cmake
@@ -207,6 +207,7 @@ if(xrpld)
       src/test/rpc/ValidatorRPC_test.cpp
       src/test/ledger/Invariants_test.cpp
       PROPERTIES SKIP_UNITY_BUILD_INCLUSION TRUE)
+
   # For the time being, we will keep the name of the binary as it was.
   set_target_properties(xrpld PROPERTIES OUTPUT_NAME "rippled")
   endif()
diff --git a/cmake/XrplValidatorKeys.cmake b/cmake/XrplValidatorKeys.cmake
index a0da504537..fa520ce9c1 100644
--- a/cmake/XrplValidatorKeys.cmake
+++ b/cmake/XrplValidatorKeys.cmake
@@ -10,7 +10,7 @@ if (validator_keys)
 
   FetchContent_Declare (
     validator_keys
-    GIT_REPOSITORY https://github.com/xrpl/validator-keys-tool.git
+    GIT_REPOSITORY https://github.com/ripple/validator-keys-tool.git
     GIT_TAG        "${current_branch}"
   )
   FetchContent_MakeAvailable(validator_keys)