From d5e03cca885465f28a01feca00583fa1073a36c5 Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <hugovk@users.noreply.github.com>
Date: Sun, 28 May 2023 21:20:42 +0300
Subject: [PATCH] Wrap arguments before passing

Co-authored-by: nulano <nulano@nulano.eu>
---
 .appveyor.yml                      | 2 +-
 .github/workflows/test-windows.yml | 6 +++---
 winbuild/build_prepare.py          | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index cb364af55..575b6caa6 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -72,7 +72,7 @@ before_deploy:
   - cd c:\pillow
   - '%PYTHON%\%EXECUTABLE% -m pip install wheel'
   - cd c:\pillow\winbuild\
-  - c:\pillow\winbuild\build\build_pillow.cmd bdist_wheel
+  - c:\pillow\winbuild\build\build_pillow.cmd --global-option="bdist_wheel"
   - cd c:\pillow
   - ps: Get-ChildItem .\dist\*.* | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
 
diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml
index a00880111..fbfec8c13 100644
--- a/.github/workflows/test-windows.yml
+++ b/.github/workflows/test-windows.yml
@@ -166,8 +166,8 @@ jobs:
     - name: Build Pillow
       run: |
         $FLAGS=""
-        if ('${{ github.event_name }}' -ne 'pull_request') { $FLAGS="--disable-imagequant" }
-        & winbuild\build\build_pillow.cmd $FLAGS install
+        if ('${{ github.event_name }}' -ne 'pull_request') { $FLAGS='--global-option="--disable-imagequant"' }
+        & winbuild\build\build_pillow.cmd $FLAGS --global-option="install"
         & $env:pythonLocation\python.exe selftest.py --installed
       shell: pwsh
 
@@ -231,7 +231,7 @@ jobs:
           )
         )
         for /f "tokens=3 delims=/" %%a in ("${{ github.ref }}") do echo dist=dist-%%a >> %GITHUB_OUTPUT%
-        winbuild\\build\\build_pillow.cmd --disable-imagequant bdist_wheel
+        winbuild\\build\\build_pillow.cmd --global-option="--disable-imagequant" --global-option="bdist_wheel"
       shell: cmd
 
     - name: Upload wheel
diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py
index 12d2efbbc..21b6c10a5 100644
--- a/winbuild/build_prepare.py
+++ b/winbuild/build_prepare.py
@@ -572,7 +572,7 @@ def build_pillow():
         r'"{python_dir}\{python_exe}" -m pip install . '
         r'--global-option="--vendor-raqm" '
         r'--global-option="--vendor-fribidi" '
-        r'--global-option="%*"',
+        r"%*",
     ]
 
     write_script("build_pillow.cmd", lines)