From f5f7b2d333400e19fc2463227805bc9a4786775f Mon Sep 17 00:00:00 2001
From: jingjingxyk <zonghengbaihe521@qq.com>
Date: Thu, 9 Jan 2025 22:27:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20cygwin=20=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../quickstart/windows/cygwin-build/README.md | 38 +++++++++++++++++--
 .../windows/cygwin-build/install-cygwin.bat   | 26 ++++++++-----
 2 files changed, 50 insertions(+), 14 deletions(-)

diff --git a/sapi/quickstart/windows/cygwin-build/README.md b/sapi/quickstart/windows/cygwin-build/README.md
index 23937d8589..9acbf3bf67 100644
--- a/sapi/quickstart/windows/cygwin-build/README.md
+++ b/sapi/quickstart/windows/cygwin-build/README.md
@@ -2,19 +2,49 @@
 
 ## [windows cygwin 环境 构建步骤](../../../../docs/Cygwin.md)
 
-## 双击如下两个脚本，自动下载cygwin 和 cygwin安装依赖库
+## 自动下载cygwin 和 cygwin安装依赖库
 
 ```shell
 
 # 自动下载 cygwin
-sapi\quickstart\windows\cygwin-build\download-cygwin.bat
+.\sapi\quickstart\windows\cygwin-build\download-cygwin.bat
 # 自动安装 依赖包
-sapi\quickstart\windows\cygwin-build\install-cygwin.bat
+.\sapi\quickstart\windows\cygwin-build\install-cygwin.bat
 
 
 ```
 
-# windows 软连接例子
+### 使用镜像 安装　cygwin 环境依赖包
+
+```
+.\sapi\quickstart\windows\cygwin-build\install-cygwin.bat --mirror china
+
+```
+
+### PowerShell 环境中调用批处理命令
+
+```powershell
+
+cmd /c .\sapi\quickstart\windows\cygwin-build\install-cygwin.bat --mirror china
+
+```
+
+## 进入cygwin 环境
+
+```
+C:\cygwin64\bin\mintty.exe -i /Cygwin-Terminal.ico -
+
+```
+
+### cygwin mirror
+
+    https://cygwin.com/mirrors.html
+
+### 搜索包
+
+    https://cygwin.com/cgi-bin2/package-grep.cgi?grep=openssl
+
+### windows 软连接例子
 
 ```bash
 
diff --git a/sapi/quickstart/windows/cygwin-build/install-cygwin.bat b/sapi/quickstart/windows/cygwin-build/install-cygwin.bat
index 947c6fa2d4..5523eaa944 100644
--- a/sapi/quickstart/windows/cygwin-build/install-cygwin.bat
+++ b/sapi/quickstart/windows/cygwin-build/install-cygwin.bat
@@ -12,31 +12,37 @@ cd /d ..\..\..\..\
 set "__PROJECT__=%cd%"
 cd /d %__PROJECT__%\
 echo %cd%
-:: package  separate with commas
 
 
-set SITE="https://mirrors.kernel.org/sourceware/cygwin/"
+
+set "SITE=https://mirrors.kernel.org/sourceware/cygwin/"
 
 :getopt
 if /i "%1" equ "--mirror" (
 	if /i "%2" equ "china" (
-		set SITE="https://mirrors.ustc.edu.cn/cygwin/"
+		set "SITE=https://mirrors.ustc.edu.cn/cygwin/"
 	)
 )
 shift
 
 if not (%1)==() goto getopt
 
-if "%GITHUB_ACTIONS%"=="" (
-	setup-x86_64.exe --quiet-mode --disable-buggy-antivirus --site %SITE%
-)
+set "OPTIONS= --quiet-mode --disable-buggy-antivirus --site  %SITE%  "
+set "PACKAGES="
 
-setup-x86_64.exe  --no-desktop --no-shortcuts --no-startmenu --quiet-mode --disable-buggy-antivirus  --site  %SITE% --packages make,git,curl,wget,tar,libtool,bison,gcc-g++,autoconf,automake,openssl,libpcre2-devel,libssl-devel,libcurl-devel,libxml2-devel,libxslt-devel,libgmp-devel,ImageMagick,libpng-devel,libjpeg-devel,libfreetype-devel,libwebp-devel,libsqlite3-devel,zlib-devel,libbz2-devel,liblz4-devel,liblzma-devel,libzip-devel,libicu-devel,libonig-devel,libcares-devel,libsodium-devel,libyaml-devel,libMagick-devel,libzstd-devel,libbrotli-devel,libreadline-devel,libintl-devel,libpq-devel,libssh2-devel,libidn2-devel,gettext-devel,coreutils
+if defined GITHUB_ACTIONS (
+	set "OPTIONS= %OPTIONS% --no-desktop --no-shortcuts --no-startmenu  "
+)
 
-setup-x86_64.exe  --no-desktop --no-shortcuts --no-startmenu --quiet-mode --disable-buggy-antivirus  --site %SITE% --packages zip unzip
+:: package  separate with commas
+set "PACKAGES=make,git,curl,wget,tar,libtool,bison,gcc-g++,autoconf,automake,openssl,libpcre2-devel,libssl-devel,libcurl-devel,libxml2-devel,libxslt-devel,libgmp-devel,ImageMagick,libpng-devel,libjpeg-devel,libfreetype-devel,libwebp-devel,libsqlite3-devel,zlib-devel,libbz2-devel,liblz4-devel,liblzma-devel,libzip-devel,libicu-devel,libonig-devel,libcares-devel,libsodium-devel,libyaml-devel,libMagick-devel,libzstd-devel,libbrotli-devel,libreadline-devel,libintl-devel,libpq-devel,libssh2-devel,libidn2-devel,gettext-devel,coreutils"
+set "PACKAGES=%PACKAGES%,zip,unzip"
+set "PACKAGES=%PACKAGES%,libpq5,libpq-devel"
+set "PACKAGES=%PACKAGES%,libzstd-devel"
 
-setup-x86_64.exe  --no-desktop --no-shortcuts --no-startmenu --quiet-mode --disable-buggy-antivirus  --site %SITE% --packages libpq5 libpq-devel
+set "OPTIONS=%OPTIONS% --packages %PACKAGES%"
+echo %OPTIONS%
 
-setup-x86_64.exe  --no-desktop --no-shortcuts --no-startmenu --quiet-mode --disable-buggy-antivirus  --site %SITE% --packages libzstd-devel
+start /b /wait setup-x86_64.exe  %OPTIONS%
 
 endlocal