fix download swoole-cli runtime bug

swoole · Dec 5, 2024 · 9723f24 · 9723f24
1 parent 7fef348
commit 9723f24
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/ext/swoole b/ext/swoole
diff --git a/setup-swoole-cli-runtime.sh b/setup-swoole-cli-runtime.sh
@@ -70,8 +70,17 @@ while [ $# -gt 0 ]; do
     ;;
   --version)
     # 指定发布 TAG
-    X_VERSION=$(echo "$2" | grep -E '^v\d\.\d{1,2}\.\d{1,2}\.\d{1,2}$')
-    X_APP_VERSION=$(echo "$2" | grep -Eo '^v\d\.\d{1,2}\.\d{1,2}')
+    if [ $OS = "macos" ]; then
+      X_VERSION=$(echo "$2" | grep -E '^v\d\.\d{1,2}\.\d{1,2}\.\d{1,2}$')
+      X_APP_VERSION=$(echo "$2" | grep -Eo '^v\d\.\d{1,2}\.\d{1,2}')
+    elif [ $OS = "linux" ]; then
+      X_VERSION=$(echo "$2" | grep -P '^v\d\.\d{1,2}\.\d{1,2}\.\d{1,2}$')
+      X_APP_VERSION=$(echo "$2" | grep -Po '^v\d\.\d{1,2}\.\d{1,2}')
+    else
+      X_VERSION=''
+      X_APP_VERSION=''
+    fi
+
     if [[ -n $X_VERSION ]] && [[ -n $X_APP_VERSION ]]; then
       {
         VERSION=$X_VERSION
+2 −2		core-tests/src/coroutine/system.cpp
+1 −1		ext-src/stubs/php_swoole_coroutine_system.stub.php
+2 −2		ext-src/stubs/php_swoole_coroutine_system_arginfo.h
+24 −13		ext-src/swoole_client.cc
+15 −8		ext-src/swoole_client_async.cc
+3 −2		ext-src/swoole_coroutine_system.cc
+2 −2		include/swoole_coroutine_system.h
+0 −0		scripts/install-deps-on-ubuntu.sh
+26 −12		src/coroutine/system.cc
+16 −0		tests/swoole_client_async/enableSSL_bad_callback.phpt
+33 −0		tests/swoole_client_sync/enableSSL.phpt
+18 −0		tests/swoole_client_sync/enableSSL_2.phpt
+2 −2		tests/swoole_coroutine_system/waitSignal.phpt
+2 −2		tests/swoole_coroutine_system/waitSignal_2.phpt
+2 −2		tests/swoole_timer/bug_4794_4.phpt