From ed9c67997a26c0aac6b7a89e9e8161ce89008a5c Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniels@collabora.com>
Date: Thu, 29 Aug 2024 18:49:26 +0100
Subject: [PATCH] ci/wine: Make build-wine safe for set -u

Signed-off-by: Daniel Stone <daniels@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31281>
---
 .gitlab-ci/container/install-wine-apitrace.sh | 2 ++
 .gitlab-ci/container/install-wine-dxvk.sh     | 2 +-
 .gitlab-ci/container/setup-wine.sh            | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci/container/install-wine-apitrace.sh b/.gitlab-ci/container/install-wine-apitrace.sh
index 40ce5493f46..eb4f168edea 100644
--- a/.gitlab-ci/container/install-wine-apitrace.sh
+++ b/.gitlab-ci/container/install-wine-apitrace.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -ue
+
 APITRACE_VERSION="11.1"
 APITRACE_VERSION_DATE=""
 
diff --git a/.gitlab-ci/container/install-wine-dxvk.sh b/.gitlab-ci/container/install-wine-dxvk.sh
index 9448a9b7934..478589035dc 100755
--- a/.gitlab-ci/container/install-wine-dxvk.sh
+++ b/.gitlab-ci/container/install-wine-dxvk.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -e
+set -ue
 
 overrideDll() {
   if ! wine reg add 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v "$1" /d native /f; then
diff --git a/.gitlab-ci/container/setup-wine.sh b/.gitlab-ci/container/setup-wine.sh
index 1c8158ad8d9..7e61e918c79 100755
--- a/.gitlab-ci/container/setup-wine.sh
+++ b/.gitlab-ci/container/setup-wine.sh
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+set -u
+
 export WINEPREFIX="$1"
 export WINEDEBUG="-all"