From 574ad5d2742eedca0daa33a6bfa2b1eb82bebe75 Mon Sep 17 00:00:00 2001
From: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Wed, 4 Jun 2025 15:12:18 -0400
Subject: [PATCH] Fix quoting and other issues in gcc-toolset-env script

Resolves: RHEL-94760
---
 gcc-toolset-15.spec |  5 ++++-
 gcc-toolset-env.in  | 11 +++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/gcc-toolset-15.spec b/gcc-toolset-15.spec
index 6f35ce8..b655aad 100644
--- a/gcc-toolset-15.spec
+++ b/gcc-toolset-15.spec
@@ -33,7 +33,7 @@ BuildRequires: scl-utils-build
 Summary: Package that installs %scl
 Name: %scl_name
 Version: %{gts_ver}.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: Applications/File
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -259,6 +259,9 @@ fi
 %endif
 
 %changelog
+* Wed Jun  4 2025 Siddhesh Poyarekar <siddhesh@redhat.com> - 15.0-5
+- Fix quoting and other issues in gcc-toolset-env script (RHEL-94760)
+
 * Thu May 15 2025 Siddhesh Poyarekar <siddhesh@redhat.com> - 15.0-4
 - New script to replace scl-enable (RHEL-88743).
 
diff --git a/gcc-toolset-env.in b/gcc-toolset-env.in
index 7a96adb..7034696 100644
--- a/gcc-toolset-env.in
+++ b/gcc-toolset-env.in
@@ -1,11 +1,10 @@
+#!/usr/bin/sh
 # Environment wrapper for GCC Toolset %{gts_ver}
 
-source %{_root_prefix}/lib/gcc-toolset/%{gts_ver}-env.source
+. %{_root_prefix}/lib/gcc-toolset/%{gts_ver}-env.source
 
-if [ -z $1 ]; then
-  cmd="/bin/sh"
+if [ -z "$1" ]; then
+  exec /usr/bin/sh
 else
-  cmd=$*
+  exec "$@"
 fi
-
-exec $cmd