Merge pull request #165 from IceCodeNew/develop

v2fly · Oct 13, 2020 · 7fef216 · 7fef216
2 parents 8ec8a25 + c394655
commit 7fef216
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/.github/workflows/sh-checker.yml b/.github/workflows/sh-checker.yml
@@ -14,7 +14,7 @@ on:
       - develop
 jobs:
   sh-checker:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-16.04
     steps:
       - uses: actions/checkout@v2
       - name: Run the sh-checker
@@ -26,11 +26,11 @@ jobs:
           sh_checker_comment: true
           sh_checker_exclude: "LICENSE README.md README.zh-Hans-CN.md"
   filed-test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-16.04
     steps:
       - name: Checkout
         uses: actions/checkout@v2
-      - name: Filed-test on Ubuntu
+      - name: Filed-test on Ubuntu 16.04
         run: |
           sudo bash install-release.sh
           sudo bash install-release.sh --check

diff --git a/install-release.sh b/install-release.sh
@@ -116,27 +116,22 @@ identify_the_operating_system_and_architecture() {
       PACKAGE_MANAGEMENT_INSTALL='apt -y --no-install-recommends install'
       PACKAGE_MANAGEMENT_REMOVE='apt purge'
       package_provide_tput='ncurses-bin'
-      package_provide_bsdtar='libarchive-tools'
     elif [[ "$(type -P dnf)" ]]; then
       PACKAGE_MANAGEMENT_INSTALL='dnf -y install'
       PACKAGE_MANAGEMENT_REMOVE='dnf remove'
       package_provide_tput='ncurses'
-      package_provide_bsdtar='bsdtar'
     elif [[ "$(type -P yum)" ]]; then
       PACKAGE_MANAGEMENT_INSTALL='yum -y install'
       PACKAGE_MANAGEMENT_REMOVE='yum remove'
       package_provide_tput='ncurses'
-      package_provide_bsdtar='bsdtar'
     elif [[ "$(type -P zypper)" ]]; then
       PACKAGE_MANAGEMENT_INSTALL='zypper install -y --no-recommends'
       PACKAGE_MANAGEMENT_REMOVE='zypper remove'
       package_provide_tput='ncurses-utils'
-      package_provide_bsdtar='bsdtar'
     elif [[ "$(type -P pacman)" ]]; then
       PACKAGE_MANAGEMENT_INSTALL='pacman -Syu --noconfirm'
       PACKAGE_MANAGEMENT_REMOVE='pacman -Rsn'
       package_provide_tput='ncurses'
-      package_provide_bsdtar='libarchive'
     else
       echo "error: The script does not support the package manager in this operating system."
       exit 1
@@ -307,7 +302,7 @@ download_v2ray() {
 }
 
 decompression() {
-  if ! bsdtar -C "$TMP_DIRECTORY" -xf "$1"; then
+  if ! unzip -q "$1" -d "$TMP_DIRECTORY"; then
     echo 'error: V2Ray decompression failed.'
     "rm" -r "$TMP_DIRECTORY"
     echo "removed: $TMP_DIRECTORY"
@@ -531,7 +526,7 @@ main() {
     echo 'warn: Install V2Ray from a local file, but still need to make sure the network is available.'
     echo -n 'warn: Please make sure the file is valid because we cannot confirm it. (Press any key) ...'
     read -r
-    install_software "$package_provide_bsdtar" 'bsdtar'
+    install_software 'unzip' 'unzip'
     decompression "$LOCAL_FILE"
   else
     # Normal way
@@ -546,7 +541,7 @@ main() {
         echo "removed: $TMP_DIRECTORY"
         exit 0
       fi
-      install_software "$package_provide_bsdtar" 'bsdtar'
+      install_software 'unzip' 'unzip'
       decompression "$ZIP_FILE"
     elif [[ "$NUMBER" -eq '1' ]]; then
       echo "info: No new version. The current version of V2Ray is $CURRENT_VERSION ."