From 6c6479823cf38f10ddbb856d9e09029301eda002 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edouard=20Choini=C3=A8re?=
 <27212526+echoix@users.noreply.github.com>
Date: Sun, 31 Dec 2023 11:27:50 -0500
Subject: [PATCH] Update osgeo4w.yml use direct call

---
 .github/workflows/osgeo4w.yml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/osgeo4w.yml b/.github/workflows/osgeo4w.yml
index 53a1d412e11..1aa7aeb60f0 100644
--- a/.github/workflows/osgeo4w.yml
+++ b/.github/workflows/osgeo4w.yml
@@ -66,16 +66,22 @@ jobs:
             python3-wxpython,regex-devel,zstd-devel"
       - name: Install OSGeo4W
         run: |
-          $exe = 'osgeo4w-setup.exe'
-          Start-Process ('.\'+$exe) -ArgumentList '-A -g -k -q \
-            -s http://download.osgeo.org/osgeo4w/v2/ -P ${{ env.Deps }}' -NoNewWindow
+          &  .\"${{ env.FILE_NAME }}"  -A -g -k -q -s ${{ env.BASE_URL }} -P ${{ env.Deps }}
+  #$exe = 'osgeo4w-setup.exe'
+      #Start-Process ('.\'+$exe) -ArgumentList '-A -g -k -q \
+        #-s http://download.osgeo.org/osgeo4w/v2/ -P ${{ env.Deps }}' -NoNewWindow
 
      # .\"${{ env.FILE_NAME }}"  -A -g -k -q -s ${{ env.BASE_URL }} -P ${{ env.Deps }}
         shell: pwsh
         env:
           BASE_URL: https://download.osgeo.org/osgeo4w/v2
           FILE_NAME: osgeo4w-setup.exe
-          Deps: "proj-devel,gdal-devel,geos-devel,libtiff-devel,libpng-devel,\
+          Deps: ${{'proj-devel,gdal-devel,geos-devel,libtiff-devel,libpng-devel,
+            pdal-devel,netcdf-devel,cairo-devel,fftw,freetype-devel,gdal-ecw,
+            gdal-mrsid,liblas-devel,libxdr,libpq-devel,pdcurses,
+            python3-matplotlib,python3-numpy,python3-ply,python3-pywin32,
+            python3-wxpython,regex-devel,zstd-devel'}}
+          Deps1: "proj-devel,gdal-devel,geos-devel,libtiff-devel,libpng-devel,\
             pdal-devel,netcdf-devel,cairo-devel,fftw,freetype-devel,gdal-ecw,\
             gdal-mrsid,liblas-devel,libxdr,libpq-devel,pdcurses,\
             python3-matplotlib,python3-numpy,python3-ply,python3-pywin32,\