gitlab-ci: fix quoting of variables passed down to bare-metal runners

Eric Anholt identified the issue when merging one of my MRs: the
variable contained words in '`' backticks, which caused them to be
executed by the bare metal runner's shell.

Quote the value printed using bash's shell expansion feature to make
sure anything in the future will be properly quoted.

Signed-off-by: Eric Engestrom <eric@engestrom.ch>
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6389>

diff --git a/.gitlab-ci/bare-metal/rootfs-setup.sh b/.gitlab-ci/bare-metal/rootfs-setup.sh
index 220968aa05778db2da1055134132ca7d74037bad..27a5c40de2e568cf4cc9152a90bc77c3d504db85 100644 (file)
--- a/.gitlab-ci/bare-metal/rootfs-setup.sh
+++ b/.gitlab-ci/bare-metal/rootfs-setup.sh
@@ -49,9 +49,8 @@ for var in \
     TU_DEBUG \
     VK_DRIVER \
     ; do
     TU_DEBUG \
     VK_DRIVER \
     ; do

-  val=`echo ${!var} | sed 's|"||g'`

   if [ -n "${!var+x}" ]; then
   if [ -n "${!var+x}" ]; then

-    echo "export $var=\"${val}\"" >> $rootfs_dst/set-job-env-vars.sh
+    echo "export $var=${!var@Q}" >> $rootfs_dst/set-job-env-vars.sh

   fi
 done
 echo "Variables passed through:"
   fi
 done
 echo "Variables passed through:"