Release v4.12.0

XX-net · Oct 24, 2022 · ea01beb · ea01beb
1 parent c345af2
commit ea01beb
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 34 deletions.
diff --git a/code/default/download.md b/code/default/download.md
@@ -10,9 +10,9 @@
 
 
 
-测试版(Test version 4.11.3)：  
-[Win10 版下载](https://github.com/XX-net/XX-Net/releases/download/4.11.3/XX-Net-win10-4.11.3.7z)   
-[Win7 版下载](https://github.com/XX-net/XX-Net/releases/download/4.11.3/XX-Net-win7-4.11.3.7z)   
-[Mac 版下载](https://github.com/XX-net/XX-Net/releases/download/4.11.3/XX-Net-mac-4.11.3.7z)  
-[Linux 版下载](https://github.com/XX-net/XX-Net/archive/4.11.3.zip)  
-[Android版下载](https://github.com/XX-net/XX-Net/releases/download/4.11.3/XX-Net-4.11.3.apk)  
+测试版(Test version 4.12.0)：  
+[Win10 版下载](https://github.com/XX-net/XX-Net/releases/download/4.12.0/XX-Net-win10-4.12.0.7z)   
+[Win7 版下载](https://github.com/XX-net/XX-Net/releases/download/4.12.0/XX-Net-win7-4.12.0.7z)   
+[Mac 版下载](https://github.com/XX-net/XX-Net/releases/download/4.12.0/XX-Net-mac-4.12.0.7z)  
+[Linux 版下载](https://github.com/XX-net/XX-Net/archive/4.12.0.zip)  
+[Android版下载](https://github.com/XX-net/XX-Net/releases/download/4.12.0/XX-Net-4.12.0.apk)  
diff --git a/code/default/version.txt b/code/default/version.txt
@@ -1 +1 @@
-4.11.5
+4.12.0
diff --git a/start b/start
@@ -77,33 +77,32 @@ openwrt_setup_env()
 # Install Packages
 # get operating system name
 os_name=`uname -s`
-#if [ $os_name = 'Linux' ]; then
-#    if ! ${PYTHON} -c 'import OpenSSL' 2> /dev/null; then
-#        echo 'Installing pyOpenSSL for your system... Please type in your password if requested'
-#        if has_command zypper; then
-#            # openSUSE
-#            sudo zypper in -y python3-pyOpenSSL
-#        elif has_command apt-get; then
-#            # Debian or Debian-like
-#            sudo apt-get install -y python3-openssl
-#        elif has_command dnf; then
-#            # Fedora
-#            sudo dnf install -y python3-pyOpenSSL
-#        elif has_command yum; then
-#            # RedHat
-#            sudo yum install -y pyOpenSSL
-#        elif has_command pacman; then
-#            # ArchLinux
-#            sudo pacman -S --noconfirm python-pyopenssl
-#        elif has_command opkg; then
-#            # OpenWrt
-#            echo "install python"
-#            opkg install python3 python3-pyopenssl
-#        fi
-#        pip install pyopenssl
-#    fi
-#el
-if [ $os_name = 'Darwin' ]; then
+if [ $os_name = 'Linux' ]; then
+    if ! ${PYTHON} -c 'import brotli' 2> /dev/null; then
+        echo 'Installing brotli for your system... Please type in your password if requested'
+        if has_command zypper; then
+            # openSUSE
+            sudo zypper in -y python3-brotli
+        elif has_command apt-get; then
+            # Debian or Debian-like
+            sudo apt-get install -y python3-brotli
+        elif has_command dnf; then
+            # Fedora
+            sudo dnf install -y python3-brotli
+        elif has_command yum; then
+            # RedHat
+            sudo yum install -y pybrotli
+        elif has_command pacman; then
+            # ArchLinux
+            sudo pacman -S --noconfirm python-brotli
+        elif has_command opkg; then
+            # OpenWrt
+            echo "install python"
+            opkg install python3 python3-brotli
+        fi
+        pip install brotli
+    fi
+elif [ $os_name = 'Darwin' ]; then
 
   PYTHON310="python3/bin/python3.10"
   if test -f "$PYTHON310"; then