From 18111c3787c4e45fc79e5eea6ee8c7aa5ba1a419 Mon Sep 17 00:00:00 2001
From: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
Date: Wed, 23 Mar 2022 16:29:34 +0200
Subject: [PATCH] Revert "ci: Convert generate-env.sh to a POSIX compliant
 script"

This reverts commit 9904ea2c76e246629fab8bda455eec07aa84f3f9 since it is
not able to properly escape all special characters (i.e. [']).

The POSIX conversion is not needed anymore, as we have made 'bash'
available in LAVA rootfs.

Reported-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15524>
---
 .gitlab-ci/common/generate-env.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci/common/generate-env.sh b/.gitlab-ci/common/generate-env.sh
index 9750ded0526..784066fc25f 100755
--- a/.gitlab-ci/common/generate-env.sh
+++ b/.gitlab-ci/common/generate-env.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 for var in \
     ASAN_OPTIONS \
@@ -109,8 +109,8 @@ for var in \
     VK_CPU \
     VK_DRIVER \
     VK_ICD_FILENAMES \
-    ;
-do
-    eval val=\$${var}
-    [ -z "$val" ] || echo "export $var='$val'"
+    ; do
+  if [ -n "${!var+x}" ]; then
+    echo "export $var=${!var@Q}"
+  fi
 done