From a8f6e3c530fdaa64c7e0accd7f6a0805e24c96b8 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Mon, 29 Dec 2025 12:02:40 -0500 Subject: [PATCH] Fixing SED error. (I Hate sed) On branch development Your branch is up to date with 'origin/development'. Changes to be committed: modified: hyprwire.sh --- install-scripts/hyprwire.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/install-scripts/hyprwire.sh b/install-scripts/hyprwire.sh index 8641c87..3991404 100755 --- a/install-scripts/hyprwire.sh +++ b/install-scripts/hyprwire.sh @@ -49,10 +49,16 @@ if git clone --recursive -b "$tag" https://github.com/hyprwm/hyprwire.git; then #include #define APPEND_RANGE(vec, ...) (vec).insert((vec).end(), std::begin(__VA_ARGS__), std::end(__VA_ARGS__)) EOF - # Replace X.append_range(Y) -> APPEND_RANGE(X, Y) -git ls-files | grep -E '\\.(c|cc|cpp|cxx|h|hh|hpp)$' | xargs sed -ri 's/([A-Za-z_][A-Za-z0-9_]*)\.append_range\(/APPEND_RANGE(\1, /g' +# Replace X.append_range(Y) -> APPEND_RANGE(X, Y) only where it appears +PATCH_FILES=$(grep -RIl --exclude-dir=.git 'append_range\(' . || true) +if [ -n "$PATCH_FILES" ]; then + echo "$PATCH_FILES" | xargs -r sed -ri 's/([A-Za-z_][A-Za-z0-9_]*)\.append_range\(/APPEND_RANGE(\1, /g' +fi -cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_CXX_STANDARD=23 -DCMAKE_CXX_FLAGS="-include ${PWD}/append_range_compat.hpp" +# Absolute path for forced include +APPEND_HDR="$(pwd)/append_range_compat.hpp" + +cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_CXX_STANDARD=23 -DCMAKE_CXX_FLAGS="-include ${APPEND_HDR}" cmake --build build -j "$(nproc 2>/dev/null || getconf _NPROCESSORS_CONF)" if [ $DO_INSTALL -eq 1 ]; then if sudo cmake --install build 2>&1 | tee -a "$MLOG" ; then