From 2cb3bfa8df7cab0635be221af1c8754dbbaff335 Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Thu, 23 Jul 2026 12:31:31 +0100
Subject: [PATCH] scripted-diff: Use long form of shell options in Guix scripts

This improves readability and consistency across all Guix scripts.

-BEGIN VERIFY SCRIPT-

sed -i "s/^set -e\>/set -o errexit/g" \
 $( git grep -l "set -e" ./contrib/guix )

-END VERIFY SCRIPT-
---
 contrib/guix/guix-attest         | 2 +-
 contrib/guix/guix-clean          | 2 +-
 contrib/guix/guix-codesign       | 2 +-
 contrib/guix/guix-verify         | 2 +-
 contrib/guix/libexec/codesign.sh | 2 +-
 contrib/guix/libexec/package.sh  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/contrib/guix/guix-attest b/contrib/guix/guix-attest
index b3a20100de3..06925ffbede 100755
--- a/contrib/guix/guix-attest
+++ b/contrib/guix/guix-attest
@@ -3,7 +3,7 @@
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or https://opensource.org/license/mit.
 export LC_ALL=C.UTF-8
-set -e -o pipefail
+set -o errexit -o pipefail
 
 # Source the common prelude, which:
 #   1. Checks if we're at the top directory of the Bitcoin Core repository
diff --git a/contrib/guix/guix-clean b/contrib/guix/guix-clean
index 96cc28326e9..a72a26445a8 100755
--- a/contrib/guix/guix-clean
+++ b/contrib/guix/guix-clean
@@ -3,7 +3,7 @@
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or https://opensource.org/license/mit.
 export LC_ALL=C.UTF-8
-set -e -o pipefail
+set -o errexit -o pipefail
 
 # Source the common prelude, which:
 #   1. Checks if we're at the top directory of the Bitcoin Core repository
diff --git a/contrib/guix/guix-codesign b/contrib/guix/guix-codesign
index 3b139e1f106..179041c140a 100755
--- a/contrib/guix/guix-codesign
+++ b/contrib/guix/guix-codesign
@@ -3,7 +3,7 @@
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or https://opensource.org/license/mit.
 export LC_ALL=C.UTF-8
-set -e -o pipefail
+set -o errexit -o pipefail
 
 # Source the common prelude, which:
 #   1. Checks if we're at the top directory of the Bitcoin Core repository
diff --git a/contrib/guix/guix-verify b/contrib/guix/guix-verify
index 8e7fbb900e4..82e740036ba 100755
--- a/contrib/guix/guix-verify
+++ b/contrib/guix/guix-verify
@@ -3,7 +3,7 @@
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or https://opensource.org/license/mit.
 export LC_ALL=C.UTF-8
-set -e -o pipefail
+set -o errexit -o pipefail
 
 # Source the common prelude, which:
 #   1. Checks if we're at the top directory of the Bitcoin Core repository
diff --git a/contrib/guix/libexec/codesign.sh b/contrib/guix/libexec/codesign.sh
index 620fe31955d..21f4c110661 100755
--- a/contrib/guix/libexec/codesign.sh
+++ b/contrib/guix/libexec/codesign.sh
@@ -3,7 +3,7 @@
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or https://opensource.org/license/mit.
 export LC_ALL=C.UTF-8
-set -e -o pipefail
+set -o errexit -o pipefail
 
 # Environment variables for determinism
 export TAR_OPTIONS="--owner=0 --group=0 --numeric-owner --mtime='@${SOURCE_DATE_EPOCH}' --sort=name"
diff --git a/contrib/guix/libexec/package.sh b/contrib/guix/libexec/package.sh
index fdecd9a0906..05f5e61f744 100755
--- a/contrib/guix/libexec/package.sh
+++ b/contrib/guix/libexec/package.sh
@@ -3,7 +3,7 @@
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or https://opensource.org/license/mit.
 export LC_ALL=C.UTF-8
-set -e -o pipefail
+set -o errexit -o pipefail
 
 (
     cd "$DISTSRC"