From 6a41e19f7ab98b46cbf00a4d9f10395e2113ff1d Mon Sep 17 00:00:00 2001 From: quydang <81231812+quydang04@users.noreply.github.com> Date: Sat, 23 Dec 2023 15:56:56 +0700 Subject: [PATCH] Update README and added support for AlmaLinux. (#1435) * Update install.sh * Update x-ui.sh * Update install.sh * Update README.md * Update install.sh --- README.md | 4 +++- install.sh | 9 +++++++-- x-ui.sh | 4 ++++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index e803ab5c..beed2644 100644 --- a/README.md +++ b/README.md @@ -354,6 +354,7 @@ XUI_BIN_FOLDER="bin" XUI_DB_FOLDER="/etc/x-ui" go build main.go - [Iran v2ray rules](https://github.com/chocolate4u/Iran-v2ray-rules) (License: **GPL-3.0**): _Enhanced v2ray/xray and v2ray/xray-clients routing rules with built-in Iranian domains and a focus on security and adblocking._ - [Iran Hosted Domains](https://github.com/bootmortis/iran-hosted-domains) (License: **MIT**): _A comprehensive list of Iranian domains and services that are hosted within the country._ - [PersianBlocker](https://github.com/MasterKia/PersianBlocker) (License: **AGPLv3**): _An optimal and extensive list to block ads and trackers on Persian websites._ +- [Vietnam Adblock rules](https://github.com/vuong2023/vn-v2ray-rules) (License: **GPL-3.0**): _A hosted domain hosted in Vietnam and blocklist with the most efficiency for Vietnamese._ # Suggestion System @@ -363,7 +364,8 @@ XUI_BIN_FOLDER="bin" XUI_DB_FOLDER="/etc/x-ui" go build main.go - Fedora 36+ - Arch Linux - Manjaro -- Armbian (for ARM devices) +- Armbian +- AlmaLinux # Pictures diff --git a/install.sh b/install.sh index 8c470cca..3dc2bb61 100644 --- a/install.sh +++ b/install.sh @@ -27,7 +27,7 @@ arch3xui() { case "$(uname -m)" in x86_64 | x64 | amd64) echo 'amd64' ;; armv8* | armv8 | arm64 | aarch64) echo 'arm64' ;; - armv7* | armv7 | arm | arm32 ) echo 'arm32' ;; + armv7* | armv7 | arm | arm32 ) echo 'arm' ;; *) echo -e "${green}Unsupported CPU architecture! ${plain}" && rm -f install.sh && exit 1 ;; esac } @@ -54,6 +54,11 @@ elif [[ "${release}" == "debian" ]]; then if [[ ${os_version} -lt 10 ]]; then echo -e "${red} Please use Debian 10 or higher ${plain}\n" && exit 1 fi + +elif [[ "${release}" == "almalinux" ]]; then + if [[ ${os_version} -lt 9 ]]; then + echo -e "${red} Please use AlmaLinux 9 or higher ${plain}\n" && exit 1 + fi elif [[ "${release}" == "arch" ]]; then echo "Your OS is ArchLinux" elif [[ "${release}" == "manjaro" ]]; then @@ -67,7 +72,7 @@ fi install_base() { case "${release}" in - centos|fedora) + centos|fedora|almalinux) yum -y update && yum install -y -q wget curl tar ;; arch|manjaro) diff --git a/x-ui.sh b/x-ui.sh index 144c377a..749e39dd 100644 --- a/x-ui.sh +++ b/x-ui.sh @@ -54,6 +54,10 @@ elif [[ "${release}" == "debian" ]]; then if [[ ${os_version} -lt 10 ]]; then echo -e "${red} Please use Debian 10 or higher ${plain}\n" && exit 1 fi +elif [[ "${release}" == "almalinux" ]]; then + if [[ ${os_version} -lt 9 ]]; then + echo -e "${red} Please use Almalinux 9 or higher ${plain}\n" && exit 1 + fi elif [[ "${release}" == "arch" ]]; then echo "Your OS is ArchLinux" elif [[ "${release}" == "manjaro" ]]; then