v0.0.86 增加GooglePlay流媒体检测

Dockerfile

@@ -4,9 +4,9 @@ FROM alpine:latest
 
 # 安装必要的工具
 RUN apk add --no-cache wget curl bash
-RUN apk add  --no-cache bind-tools --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main
+RUN apk add --no-cache bind-tools --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main
 RUN apk add --no-cache grep openssl ca-certificates uuidgen
-
+RUN export noninteractive=true
 # 下载并执行 goecs.sh 脚本
 RUN curl -L https://raw.githubusercontent.com/oneclickvirt/ecs/master/goecs.sh -o goecs.sh && \
     chmod +x goecs.sh && \

README.md

@@ -47,13 +47,13 @@ Shell版本： https://github.com/spiritLHLS/ecs
 ### 一键命令
 
 ```
-curl -L https://raw.githubusercontent.com/oneclickvirt/ecs/master/goecs.sh -o goecs.sh && chmod +x goecs.sh && bash goecs.sh env && bash goecs.sh install && goecs
+export noninteractive=true && curl -L https://raw.githubusercontent.com/oneclickvirt/ecs/master/goecs.sh -o goecs.sh && chmod +x goecs.sh && bash goecs.sh env && bash goecs.sh install && goecs
 ```
 
 或
 
 ```
-curl -L https://cdn.spiritlhl.net/https://raw.githubusercontent.com/oneclickvirt/ecs/master/goecs.sh -o goecs.sh && chmod +x goecs.sh && bash goecs.sh env && bash goecs.sh install && goecs
+export noninteractive=true && curl -L https://cdn.spiritlhl.net/https://raw.githubusercontent.com/oneclickvirt/ecs/master/goecs.sh -o goecs.sh && chmod +x goecs.sh && bash goecs.sh env && bash goecs.sh install && goecs
 ```
 
 ### 详细说明
@@ -76,6 +76,8 @@ curl -L https://cdn.spiritlhl.net/https://raw.githubusercontent.com/oneclickvirt
 ./goecs.sh env
 ```
 
+如果不想要互动，可使用```export noninteractive=true```再执行```env```命令
+
 安装goecs
 
 ```

README_EN.md

@@ -47,7 +47,7 @@ Systems to be supported (hardware testing bugs not yet fixed): MacOS、FreeBSD
 ### one-click command
 
 ```
-curl -L https://raw.githubusercontent.com/oneclickvirt/ecs/master/goecs.sh -o goecs.sh && chmod +x goecs.sh && bash goecs.sh env && bash goecs.sh install && goecs -l en
+export noninteractive=true && curl -L https://raw.githubusercontent.com/oneclickvirt/ecs/master/goecs.sh -o goecs.sh && chmod +x goecs.sh && bash goecs.sh env && bash goecs.sh install && goecs -l en
 ```
 
 ### explain in detail
@@ -64,6 +64,8 @@ Install environment
 ./goecs.sh env
 ```
 
+If you don't want interaction, use ```export noninteractive=true``` and then execute the ```env``` command
+
 Install goecs
 
 ```

go.mod

@@ -5,7 +5,7 @@ go 1.22.4
 require (
 	github.com/imroc/req/v3 v3.43.7
 	github.com/oneclickvirt/CommonMediaTests v0.0.4-20240704024502
-	github.com/oneclickvirt/UnlockTests v0.0.18-20241118031951
+	github.com/oneclickvirt/UnlockTests v0.0.19-20241123125400
 	github.com/oneclickvirt/backtrace v0.0.4-20240702140722
 	github.com/oneclickvirt/basics v0.0.8-20241108124433
 	github.com/oneclickvirt/cputest v0.0.8-20240702070215

go.sum

@@ -104,8 +104,8 @@ github.com/nxtrace/NTrace-core v1.3.2 h1:8aU/IQFmPnwbaWGVBIJHwwVIWk+roo+9+lG+U0O
 github.com/nxtrace/NTrace-core v1.3.2/go.mod h1:qCVsgSs982jw02BVjTtN8mjSg5OIXW9TaUdISQrMnTw=
 github.com/oneclickvirt/CommonMediaTests v0.0.4-20240704024502 h1:hRIYJ2uEp2N3AH5bP5X6bwfdwWfZQO/2WoqpUJ8+WsY=
 github.com/oneclickvirt/CommonMediaTests v0.0.4-20240704024502/go.mod h1:DAmFPRjFV5p9fEzUUSml5jJGn2f1NZJQCzTxITHDjc4=
-github.com/oneclickvirt/UnlockTests v0.0.18-20241118031951 h1:3Tvl4s6Zwwbo0N1g4/YdaS8oZAUehcWRal/llzwWI6o=
-github.com/oneclickvirt/UnlockTests v0.0.18-20241118031951/go.mod h1:UELwZDDiddSxe38boYOPl1FlrL0ptEZYSQwdE3MYvUM=
+github.com/oneclickvirt/UnlockTests v0.0.19-20241123125400 h1:grW8HzS4v0mRQ2ZBtR7CNg+k9he5QtgW/CQ86Ux0rdg=
+github.com/oneclickvirt/UnlockTests v0.0.19-20241123125400/go.mod h1:UELwZDDiddSxe38boYOPl1FlrL0ptEZYSQwdE3MYvUM=
 github.com/oneclickvirt/backtrace v0.0.4-20240702140722 h1:UJ/VWf+ZbhGarc9HcHMIyenpmX+b2LxkXu0hlLk3Gxs=
 github.com/oneclickvirt/backtrace v0.0.4-20240702140722/go.mod h1:zvsC7xY/WZqs5KL2JB967OVnuqjNbxu9bW6wXRLo5h8=
 github.com/oneclickvirt/basics v0.0.8-20241108124433 h1:eKZcoNoa9uLWmfisk+qN/QOvSGT4ajCmZdZfIAcHG+o=

goecs.go

@@ -39,7 +39,7 @@ import (
 )
 
 var (
-	ecsVersion                                                        = "v0.0.85"
+	ecsVersion                                                        = "v0.0.86"
 	menuMode                                                          bool
 	onlyChinaTest                                                     bool
 	input, choice                                                     string

goecs.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 # From https://github.com/oneclickvirt/ecs
-# 2024.11.17
+# 2024.11.18
 
 # curl -L https://raw.githubusercontent.com/oneclickvirt/ecs/master/goecs.sh -o goecs.sh && chmod +x goecs.sh
 
@@ -245,10 +245,12 @@ InstallSysbench() {
         echo "Error: Unable to determine memory size or memory size is zero."
     elif [ $mem_size -lt 1024 ]; then
         _red "Warning: Your system has less than 1GB RAM (${mem_size}MB)"
-        reading "Do you want to continue with EPEL installation? (y/N): " confirm
-        if [[ ! $confirm =~ ^[Yy]$ ]]; then
-            _yellow "Skipping EPEL installation"
-            return 1
+        if [ "$noninteractive" != "true" ]; then
+            reading "Do you want to continue with EPEL installation? (y/N): " confirm
+            if [[ ! $confirm =~ ^[Yy]$ ]]; then
+                _yellow "Skipping EPEL installation"
+                return 1
+            fi
         fi
         case "$Var_OSRelease" in
         ubuntu | debian | astra) 
@@ -261,8 +263,35 @@ InstallSysbench() {
             pacman -S --needed --noconfirm sysbench && pacman -S --needed --noconfirm libaio && ldconfig ;;
         freebsd) 
             pkg install -y sysbench ;;
-        alpinelinux) 
-            echo -e "${Msg_Warning}Sysbench Module not found, installing ..." && echo -e "${Msg_Warning}SysBench Current not support Alpine Linux, Skipping..." && Var_Skip_SysBench="1" ;;
+        alpinelinux)
+            if [ "$noninteractive" != "true" ]; then
+                reading "Do you want to continue with sysbench installation? (y/N): " confirm
+                if [[ ! $confirm =~ ^[Yy]$ ]]; then
+                    _yellow "Skipping sysbench installation"
+                    return 1
+                fi
+            fi
+            ALPINE_VERSION=$(grep -o '^[0-9]\+\.[0-9]\+' /etc/alpine-release)
+            COMMUNITY_REPO="http://dl-cdn.alpinelinux.org/alpine/v${ALPINE_VERSION}/community"
+            if grep -q "^${COMMUNITY_REPO}" /etc/apk/repositories; then
+                echo "Community repository is already enabled."
+            else
+                echo "Enabling community repository..."
+                echo "${COMMUNITY_REPO}" >> /etc/apk/repositories
+                echo "Community repository has been added."
+                echo "Updating apk package index..."
+                apk update && echo "Package index updated successfully."
+            fi
+            if apk info sysbench >/dev/null 2>&1; then
+                echo -e "${Msg_Info}Sysbench already installed."
+            else
+                apk add --no-cache sysbench
+                if [ $? -ne 0 ]; then
+                    echo -e "${Msg_Warning}Sysbench Module not found, installing ..." && echo -e "${Msg_Warning}SysBench Current not support Alpine Linux, Skipping..." && Var_Skip_SysBench="1"
+                else
+                    echo -e "${Msg_Success}Sysbench installed successfully."
+                fi
+            fi ;;
         *) 
             _red "Sysbench Install Error: Unknown OS release: $Var_OSRelease" ;;
         esac
@@ -342,10 +371,10 @@ prepare_compile_env() {
 env_check() {
     REGEX=("debian|astra" "ubuntu" "centos|red hat|kernel|oracle linux|alma|rocky" "'amazon linux'" "fedora" "arch" "freebsd" "alpine" "openbsd" "opencloudos")
     RELEASE=("Debian" "Ubuntu" "CentOS" "CentOS" "Fedora" "Arch" "FreeBSD" "Alpine" "OpenBSD" "OpenCloudOS")
-    PACKAGE_UPDATE=("apt-get update" "apt-get update" "yum -y update" "yum -y update" "yum -y update" "yum -y update" "pacman -Sy" "pkg update" "apk update" "yum -y update")
-    PACKAGE_INSTALL=("apt-get -y install" "apt-get -y install" "yum -y install" "yum -y install" "yum -y install" "yum -y install" "pacman -Sy --noconfirm --needed" "pkg install -y" "apk add" "yum -y install")
-    PACKAGE_REMOVE=("apt-get -y remove" "apt-get -y remove" "yum -y remove" "yum -y remove" "yum -y remove" "yum -y remove" "pacman -Rsc --noconfirm" "pkg delete" "apk del" "yum -y remove")
-    PACKAGE_UNINSTALL=("apt-get -y autoremove" "apt-get -y autoremove" "yum -y autoremove" "yum -y autoremove" "yum -y autoremove" "yum -y autoremove" "pacman -Rns --noconfirm" "pkg autoremove" "apk autoremove" "yum -y autoremove")
+    PACKAGE_UPDATE=("apt-get update" "apt-get update" "yum -y update" "yum -y update" "yum -y update" "pacman -Sy" "pkg update" "apk update" "pkg_add -qu" "yum -y update")
+    PACKAGE_INSTALL=("apt-get -y install" "apt-get -y install" "yum -y install" "yum -y install" "yum -y install" "pacman -Sy --noconfirm --needed" "pkg install -y" "apk add --no-cache" "pkg_add -I" "yum -y install")
+    PACKAGE_REMOVE=("apt-get -y remove" "apt-get -y remove" "yum -y remove" "yum -y remove" "yum -y remove" "pacman -Rsc --noconfirm" "pkg delete" "apk del" "pkg_delete -I" "yum -y remove")
+    PACKAGE_UNINSTALL=("apt-get -y autoremove" "apt-get -y autoremove" "yum -y autoremove" "yum -y autoremove" "yum -y autoremove" "pacman -Rns --noconfirm" "pkg autoremove" "apk autoremove" "pkg_delete -a" "yum -y autoremove")
     # 检查系统信息
     if [ -f /etc/opencloudos-release ]; then
         SYS="opencloudos"
@@ -397,14 +426,16 @@ env_check() {
     _yellow "2. Cause temporary network interruptions"
     _yellow "3. Impact system stability"
     _yellow "4. Affect future system startup"
-    reading "Do you want to proceed with system update? (y/N): " update_confirm
-    if [[ ! $update_confirm =~ ^[Yy]$ ]]; then
-        _yellow "Skipping system update"
-        _yellow "Note: Some package installations may fail"
-    else
-        _green "Updating system package manager..."
-        if ! ${PACKAGE_UPDATE[int]} 2>/dev/null; then
-            _red "System update failed!"
+    if [ "$noninteractive" != "true" ]; then
+        reading "Do you want to proceed with system update? (y/N): " update_confirm
+        if [[ ! $update_confirm =~ ^[Yy]$ ]]; then
+            _yellow "Skipping system update"
+            _yellow "Note: Some package installations may fail"
+        else
+            _green "Updating system package manager..."
+            if ! ${PACKAGE_UPDATE[int]} 2>/dev/null; then
+                _red "System update failed!"
+            fi
         fi
     fi