Merge pull request #16 from jingjingxyk/dev

optimize install.sh

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
       - uses: actions/checkout@v3
       - name: native ubuntu install swoole
         run: |
-          sudo sh .github/workflows/init.sh
+          sudo sh init.sh
           sudo bash install.sh --install-php 1
       - name: show info
         run: |
@@ -34,7 +34,7 @@ jobs:
           - alpine:3.18
           - rockylinux:9.3
           - fedora:41
-          #  - archlinux:latest
+          - archlinux:latest
           - php:8.3-zts-alpine3.20
           - php:8.2-zts-alpine3.20
           - php:8.1-zts-alpine3.20
@@ -50,7 +50,7 @@ jobs:
           image: ${{ matrix.container_image }}
           options: -v ${{ github.workspace }}:/work -w /work
           run: |
-            sh .github/workflows/init.sh
+            sh init.sh
             bash install.sh --install-php 1
 
   macos:

README.md

@@ -31,21 +31,34 @@ curl -fsSL  https://gitee.com/jingjingxyk/swoole-install/raw/main/install.sh | b
 
 ```
 
+## rhel 系 、alpine、archlinux  解决 `which` command no found
+
+```bash
+
+curl -fsSL  https://github.com/swoole/installers/blob/main/init.sh?raw=true | bash
+
+# mirror
+
+curl -fsSL  https://gitee.com/jingjingxyk/swoole-install/raw/main/init.sh  | bash
+
+```
+
 ## 支持的操作系统
 
-| 操作系统                                            | 支持情况 |
-|-------------------------------------------------|------|
-| [debian](https://www.debian.org/)               | ✅    |
-| [ubuntu](https://ubuntu.com/)                   | ✅    |
-| [rockylinux](https://rockylinux.org/)           | ✅    |
-| [almalinux](https://almalinux.org/)             | ✅    |
-| [alinux](https://www.aliyun.com/product/alinux) | ✅    |
-| [anolis](https://openanolis.cn/anolisos)        | ✅    |
-| [fedora ](https://fedoraproject.org/)           | ✅    |
-| [alpine](https://www.alpinelinux.org/)          | ✅    |
-| [kali](https://www.kali.org/)                   | ✅    |
-| [macos](https://www.apple.com/)                 | ✅    |
-| wsl                                             |      |
-| FreeBSD 13                                      |      |
-| [OpenEuler](https://www.openeuler.org/)         | ✅    |
-| Huawei Cloud EulerOS                            | ✅    |
+| 操作系统                                                         | 支持情况 |
+|--------------------------------------------------------------|------|
+| [debian](https://www.debian.org/)                            | ✅    |
+| [ubuntu](https://ubuntu.com/)                                | ✅    |
+| [rockylinux](https://rockylinux.org/)                        | ✅    |
+| [almalinux](https://almalinux.org/)                          | ✅    |
+| [Alibaba cloud liunx](https://www.aliyun.com/product/alinux) | ✅    |
+| [anolis](https://openanolis.cn/anolisos)                     | ✅    |
+| [fedora ](https://fedoraproject.org/)                        | ✅    |
+| [alpine](https://www.alpinelinux.org/)                       | ✅    |
+| [kali](https://www.kali.org/)                                | ✅    |
+| [macos](https://www.apple.com/)                              | ✅    |
+| wsl                                                          |      |
+| FreeBSD 13                                                   |      |
+| [OpenEuler](https://www.openeuler.org/)                      | ✅    |
+| Huawei Cloud EulerOS                                         | ✅    |
+| [archlinux](https://archlinux.org/)                          | ✅    |

docs/FAQ.md

@@ -29,7 +29,7 @@ php --ini | grep  ".ini files"
 PHP_INI_SCAN_DIR=$(php --ini | grep  "Scan for additional .ini files in:" | awk -F 'in:' '{ print $2 }' | xargs)
 
 if [ -n "${PHP_INI_SCAN_DIR}" ] && [ -d "${PHP_INI_SCAN_DIR}" ]; then
-  SUDO=''
+  local SUDO=''
   if [ ! -w "${PHP_INI_SCAN_DIR}" ] ; then
     SUDO='sudo'
   fi

init.sh

@@ -0,0 +1,24 @@
+OS=$(uname -s)
+if [ "${OS}" == 'Linux' ]; then
+  OS_RELEASE=$(awk -F= '/^ID=/{print $2}' /etc/os-release | tr -d '\n' | tr -d '\"')
+  case "$OS_RELEASE" in
+  'rocky' | 'almalinux' | 'alinux' | 'anolis' | 'fedora' | 'openEuler' | 'hce') # |  'amzn' | 'ol' | 'rhel' | 'centos'  # 未测试
+    yum update -y
+    yum install -y which
+    ;;
+  'ubuntu')
+    if [ "$GITHUB_ACTIONS" = "true" ]; then
+      sed -i.bak "[email protected]@azure.archive.ubuntu.com@g" /etc/apt/sources.list
+      sed -i.bak "[email protected]@azure.archive.ubuntu.com@g" /etc/apt/sources.list
+    fi
+    ;;
+  'alpine')
+    apk update
+    apk add bash
+    ;;
+  'arch')
+    pacman -Syyu --noconfirm
+    pacman -Sy --noconfirm which
+    ;;
+  esac
+fi