From 5c408a353db507e7c3fa4694dd2548a4a29215bc Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Mon, 5 Oct 2020 11:31:58 +0200
Subject: [PATCH] fix quoting

---
 .github/workflows/cmake-build-ci.gen | 10 ++--
 .github/workflows/cmake-build-ci.yml | 86 ++++++++++++++--------------
 2 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/.github/workflows/cmake-build-ci.gen b/.github/workflows/cmake-build-ci.gen
index 489230fb..2f4722b3 100755
--- a/.github/workflows/cmake-build-ci.gen
+++ b/.github/workflows/cmake-build-ci.gen
@@ -96,13 +96,13 @@ function steps_setenv($splat_map = null) {
       - name: Prepare environment (<?= "for $cc_ver $cc_vnd on $os_ver" ?>)
         if: (<?="$os_is=='$os_ver') && ($cc_vnd_is=='$cc_vnd') && ($cc_ver_is=='$cc_ver'"?>)
         run: |
-          echo "CC='<?=DEF[$cc_vnd]["CC"] . $ver?>'" >> ${GITHUB_ENV}
-          echo "CXX='<?=DEF[$cc_vnd]["CXX"] . $ver?>'" >> ${GITHUB_ENV}
+          echo CC="<?=DEF[$cc_vnd]["CC"] . $ver?>" >> ${GITHUB_ENV}
+          echo CXX="<?=DEF[$cc_vnd]["CXX"] . $ver?>" >> ${GITHUB_ENV}
 <?php
                 if (isset(ENV[$os_ver][$cc_vnd][$cc_ver])) {
                   foreach (ENV[$os_ver][$cc_vnd][$cc_ver] as $env => $val) {
 ?>
-          echo "<?=$env?>='<?=$val?>'" >> ${GITHUB_ENV}}
+          echo <?=$env?>="<?=$val?>" >> ${GITHUB_ENV}}
 <?php
                   }
                 }
@@ -131,7 +131,7 @@ function steps_getdeps() {
         run: |
           brew install bison flex ${INSTALL_MEMCACHED}
           brew services stop memcached || true
-          echo "MEMCACHED_BINARY='/usr/local/bin/memcached'" >> ${GITHUB_ENV}
+          echo MEMCACHED_BINARY="/usr/local/bin/memcached" >> ${GITHUB_ENV}
       - name: Build memcached
         run: |
           if test -d memcached
@@ -151,7 +151,7 @@ function steps_getdeps() {
             make -j2
             make install
             cd ..
-            echo "MEMCACHED_BINARY='${MEMCACHED_PREFIX}/bin/memcached'" >> ${GITHUB_ENV}
+            echo MEMCACHED_BINARY="${MEMCACHED_PREFIX}/bin/memcached" >> ${GITHUB_ENV}
           fi
 <?php
 }
diff --git a/.github/workflows/cmake-build-ci.yml b/.github/workflows/cmake-build-ci.yml
index 32bfd997..43f7fb87 100644
--- a/.github/workflows/cmake-build-ci.yml
+++ b/.github/workflows/cmake-build-ci.yml
@@ -45,8 +45,8 @@ jobs:
       - name: Prepare environment (for cur gnu on ubuntu-20.04)
         if: (env.OS_VER=='ubuntu-20.04') && (env.CC_VND=='gnu') && (env.CC_VER=='cur')
         run: |
-          echo "CC='gcc-9'" >> ${GITHUB_ENV}
-          echo "CXX='g++-9'" >> ${GITHUB_ENV}
+          echo CC="gcc-9" >> ${GITHUB_ENV}
+          echo CXX="g++-9" >> ${GITHUB_ENV}
       - name: Install dependencies (Linux)
         if: runner.os == 'Linux'
         run: |
@@ -61,7 +61,7 @@ jobs:
         run: |
           brew install bison flex ${INSTALL_MEMCACHED}
           brew services stop memcached || true
-          echo "MEMCACHED_BINARY='/usr/local/bin/memcached'" >> ${GITHUB_ENV}
+          echo MEMCACHED_BINARY="/usr/local/bin/memcached" >> ${GITHUB_ENV}
       - name: Build memcached
         run: |
           if test -d memcached
@@ -81,7 +81,7 @@ jobs:
             make -j2
             make install
             cd ..
-            echo "MEMCACHED_BINARY='${MEMCACHED_PREFIX}/bin/memcached'" >> ${GITHUB_ENV}
+            echo MEMCACHED_BINARY="${MEMCACHED_PREFIX}/bin/memcached" >> ${GITHUB_ENV}
           fi
       - name: Generate build tree (${{ env.CMAKE_BUILD_TYPE }})
         run: cmake -S . -B build
@@ -106,8 +106,8 @@ jobs:
       - name: Prepare environment (for cur gnu on ubuntu-20.04)
         if: (env.OS_VER=='ubuntu-20.04') && (env.CC_VND=='gnu') && (env.CC_VER=='cur')
         run: |
-          echo "CC='gcc-9'" >> ${GITHUB_ENV}
-          echo "CXX='g++-9'" >> ${GITHUB_ENV}
+          echo CC="gcc-9" >> ${GITHUB_ENV}
+          echo CXX="g++-9" >> ${GITHUB_ENV}
       - name: Install dependencies (Linux)
         if: runner.os == 'Linux'
         run: |
@@ -122,7 +122,7 @@ jobs:
         run: |
           brew install bison flex ${INSTALL_MEMCACHED}
           brew services stop memcached || true
-          echo "MEMCACHED_BINARY='/usr/local/bin/memcached'" >> ${GITHUB_ENV}
+          echo MEMCACHED_BINARY="/usr/local/bin/memcached" >> ${GITHUB_ENV}
       - name: Build memcached
         run: |
           if test -d memcached
@@ -142,7 +142,7 @@ jobs:
             make -j2
             make install
             cd ..
-            echo "MEMCACHED_BINARY='${MEMCACHED_PREFIX}/bin/memcached'" >> ${GITHUB_ENV}
+            echo MEMCACHED_BINARY="${MEMCACHED_PREFIX}/bin/memcached" >> ${GITHUB_ENV}
           fi
       - name: Generate build tree (${{ env.CMAKE_BUILD_TYPE }})
         run: cmake -S . -B build
@@ -168,8 +168,8 @@ jobs:
       - name: Prepare environment (for cur gnu on ubuntu-20.04)
         if: (env.OS_VER=='ubuntu-20.04') && (env.CC_VND=='gnu') && (env.CC_VER=='cur')
         run: |
-          echo "CC='gcc-9'" >> ${GITHUB_ENV}
-          echo "CXX='g++-9'" >> ${GITHUB_ENV}
+          echo CC="gcc-9" >> ${GITHUB_ENV}
+          echo CXX="g++-9" >> ${GITHUB_ENV}
       - name: Install dependencies (Linux)
         if: runner.os == 'Linux'
         run: |
@@ -184,7 +184,7 @@ jobs:
         run: |
           brew install bison flex ${INSTALL_MEMCACHED}
           brew services stop memcached || true
-          echo "MEMCACHED_BINARY='/usr/local/bin/memcached'" >> ${GITHUB_ENV}
+          echo MEMCACHED_BINARY="/usr/local/bin/memcached" >> ${GITHUB_ENV}
       - name: Build memcached
         run: |
           if test -d memcached
@@ -204,7 +204,7 @@ jobs:
             make -j2
             make install
             cd ..
-            echo "MEMCACHED_BINARY='${MEMCACHED_PREFIX}/bin/memcached'" >> ${GITHUB_ENV}
+            echo MEMCACHED_BINARY="${MEMCACHED_PREFIX}/bin/memcached" >> ${GITHUB_ENV}
           fi
       - name: Generate build tree (${{ env.CMAKE_BUILD_TYPE }})
         run: cmake -S . -B build
@@ -240,7 +240,7 @@ jobs:
         run: |
           brew install bison flex ${INSTALL_MEMCACHED}
           brew services stop memcached || true
-          echo "MEMCACHED_BINARY='/usr/local/bin/memcached'" >> ${GITHUB_ENV}
+          echo MEMCACHED_BINARY="/usr/local/bin/memcached" >> ${GITHUB_ENV}
       - name: Build memcached
         run: |
           if test -d memcached
@@ -260,7 +260,7 @@ jobs:
             make -j2
             make install
             cd ..
-            echo "MEMCACHED_BINARY='${MEMCACHED_PREFIX}/bin/memcached'" >> ${GITHUB_ENV}
+            echo MEMCACHED_BINARY="${MEMCACHED_PREFIX}/bin/memcached" >> ${GITHUB_ENV}
           fi
       - name: Generate build tree (${{ env.CMAKE_BUILD_TYPE }})
         run: cmake -S . -B build
@@ -295,66 +295,66 @@ jobs:
       - name: Prepare environment (for new gnu on ubuntu-20.04)
         if: (env.OS_VER=='ubuntu-20.04') && (env.CC_VND=='gnu') && (env.CC_VER=='new')
         run: |
-          echo "CC='gcc-10'" >> ${GITHUB_ENV}
-          echo "CXX='g++-10'" >> ${GITHUB_ENV}
-          echo "INSTALL_CC='gcc-10'" >> ${GITHUB_ENV}}
-          echo "INSTALL_CXX='g++-10'" >> ${GITHUB_ENV}}
+          echo CC="gcc-10" >> ${GITHUB_ENV}
+          echo CXX="g++-10" >> ${GITHUB_ENV}
+          echo INSTALL_CC="gcc-10" >> ${GITHUB_ENV}}
+          echo INSTALL_CXX="g++-10" >> ${GITHUB_ENV}}
       - name: Prepare environment (for cur gnu on ubuntu-20.04)
         if: (env.OS_VER=='ubuntu-20.04') && (env.CC_VND=='gnu') && (env.CC_VER=='cur')
         run: |
-          echo "CC='gcc-9'" >> ${GITHUB_ENV}
-          echo "CXX='g++-9'" >> ${GITHUB_ENV}
+          echo CC="gcc-9" >> ${GITHUB_ENV}
+          echo CXX="g++-9" >> ${GITHUB_ENV}
       - name: Prepare environment (for old gnu on ubuntu-20.04)
         if: (env.OS_VER=='ubuntu-20.04') && (env.CC_VND=='gnu') && (env.CC_VER=='old')
         run: |
-          echo "CC='gcc-8'" >> ${GITHUB_ENV}
-          echo "CXX='g++-8'" >> ${GITHUB_ENV}
+          echo CC="gcc-8" >> ${GITHUB_ENV}
+          echo CXX="g++-8" >> ${GITHUB_ENV}
       - name: Prepare environment (for new clang on ubuntu-20.04)
         if: (env.OS_VER=='ubuntu-20.04') && (env.CC_VND=='clang') && (env.CC_VER=='new')
         run: |
-          echo "CC='clang-10'" >> ${GITHUB_ENV}
-          echo "CXX='clang++-10'" >> ${GITHUB_ENV}
+          echo CC="clang-10" >> ${GITHUB_ENV}
+          echo CXX="clang++-10" >> ${GITHUB_ENV}
       - name: Prepare environment (for cur clang on ubuntu-20.04)
         if: (env.OS_VER=='ubuntu-20.04') && (env.CC_VND=='clang') && (env.CC_VER=='cur')
         run: |
-          echo "CC='clang-9'" >> ${GITHUB_ENV}
-          echo "CXX='clang++-9'" >> ${GITHUB_ENV}
+          echo CC="clang-9" >> ${GITHUB_ENV}
+          echo CXX="clang++-9" >> ${GITHUB_ENV}
       - name: Prepare environment (for old clang on ubuntu-20.04)
         if: (env.OS_VER=='ubuntu-20.04') && (env.CC_VND=='clang') && (env.CC_VER=='old')
         run: |
-          echo "CC='clang-8'" >> ${GITHUB_ENV}
-          echo "CXX='clang++-8'" >> ${GITHUB_ENV}
+          echo CC="clang-8" >> ${GITHUB_ENV}
+          echo CXX="clang++-8" >> ${GITHUB_ENV}
       - name: Prepare environment (for new gnu on ubuntu-18.04)
         if: (env.OS_VER=='ubuntu-18.04') && (env.CC_VND=='gnu') && (env.CC_VER=='new')
         run: |
-          echo "CC='gcc-9'" >> ${GITHUB_ENV}
-          echo "CXX='g++-9'" >> ${GITHUB_ENV}
+          echo CC="gcc-9" >> ${GITHUB_ENV}
+          echo CXX="g++-9" >> ${GITHUB_ENV}
       - name: Prepare environment (for cur gnu on ubuntu-18.04)
         if: (env.OS_VER=='ubuntu-18.04') && (env.CC_VND=='gnu') && (env.CC_VER=='cur')
         run: |
-          echo "CC='gcc-8'" >> ${GITHUB_ENV}
-          echo "CXX='g++-8'" >> ${GITHUB_ENV}
+          echo CC="gcc-8" >> ${GITHUB_ENV}
+          echo CXX="g++-8" >> ${GITHUB_ENV}
       - name: Prepare environment (for old gnu on ubuntu-18.04)
         if: (env.OS_VER=='ubuntu-18.04') && (env.CC_VND=='gnu') && (env.CC_VER=='old')
         run: |
-          echo "CC='gcc-7'" >> ${GITHUB_ENV}
-          echo "CXX='g++-7'" >> ${GITHUB_ENV}
+          echo CC="gcc-7" >> ${GITHUB_ENV}
+          echo CXX="g++-7" >> ${GITHUB_ENV}
       - name: Prepare environment (for new clang on ubuntu-18.04)
         if: (env.OS_VER=='ubuntu-18.04') && (env.CC_VND=='clang') && (env.CC_VER=='new')
         run: |
-          echo "CC='clang-9'" >> ${GITHUB_ENV}
-          echo "CXX='clang++-9'" >> ${GITHUB_ENV}
+          echo CC="clang-9" >> ${GITHUB_ENV}
+          echo CXX="clang++-9" >> ${GITHUB_ENV}
       - name: Prepare environment (for cur clang on ubuntu-18.04)
         if: (env.OS_VER=='ubuntu-18.04') && (env.CC_VND=='clang') && (env.CC_VER=='cur')
         run: |
-          echo "CC='clang-8'" >> ${GITHUB_ENV}
-          echo "CXX='clang++-8'" >> ${GITHUB_ENV}
+          echo CC="clang-8" >> ${GITHUB_ENV}
+          echo CXX="clang++-8" >> ${GITHUB_ENV}
       - name: Prepare environment (for old clang on ubuntu-18.04)
         if: (env.OS_VER=='ubuntu-18.04') && (env.CC_VND=='clang') && (env.CC_VER=='old')
         run: |
-          echo "CC='clang-6.0'" >> ${GITHUB_ENV}
-          echo "CXX='clang++-6.0'" >> ${GITHUB_ENV}
-          echo "CXXFLAGS='-stdlib=libc++'" >> ${GITHUB_ENV}}
+          echo CC="clang-6.0" >> ${GITHUB_ENV}
+          echo CXX="clang++-6.0" >> ${GITHUB_ENV}
+          echo CXXFLAGS="-stdlib=libc++" >> ${GITHUB_ENV}}
       - name: Install dependencies (Linux)
         if: runner.os == 'Linux'
         run: |
@@ -369,7 +369,7 @@ jobs:
         run: |
           brew install bison flex ${INSTALL_MEMCACHED}
           brew services stop memcached || true
-          echo "MEMCACHED_BINARY='/usr/local/bin/memcached'" >> ${GITHUB_ENV}
+          echo MEMCACHED_BINARY="/usr/local/bin/memcached" >> ${GITHUB_ENV}
       - name: Build memcached
         run: |
           if test -d memcached
@@ -389,7 +389,7 @@ jobs:
             make -j2
             make install
             cd ..
-            echo "MEMCACHED_BINARY='${MEMCACHED_PREFIX}/bin/memcached'" >> ${GITHUB_ENV}
+            echo MEMCACHED_BINARY="${MEMCACHED_PREFIX}/bin/memcached" >> ${GITHUB_ENV}
           fi
       - name: Generate build tree (${{ env.CMAKE_BUILD_TYPE }})
         run: cmake -S . -B build
-- 
2.30.2