diff --git a/install.sh b/install.sh index 3338b64f..d49ee967 100644 --- a/install.sh +++ b/install.sh @@ -26,7 +26,8 @@ echo "The OS release is: $release" arch3xui() { case "$(uname -m)" in x86_64 | x64 | amd64) echo 'amd64' ;; - armv8 | arm64 | aarch64) echo 'arm64' ;; + armv8* | armv8 | arm64 | aarch64) echo 'arm64' ;; + armv7* | arm | armv7l ) echo 'arm' ;; *) echo -e "${green}Unsupported CPU architecture! ${plain}" && rm -f install.sh && exit 1 ;; esac } @@ -54,7 +55,11 @@ elif [[ "${release}" == "debian" ]]; then echo -e "${red} Please use Debian 10 or higher ${plain}\n" && exit 1 fi elif [[ "${release}" == "arch" ]]; then - echo "OS is ArchLinux" + echo "Your OS is ArchLinux" +elif [[ "${release}" == "manjaro" ]]; then + echo "Your OS is Manjaro" +elif [[ "${release}" == "armbian" ]]; then + echo "Your OS is Armbian" else echo -e "${red}Failed to check the OS version, please contact the author!${plain}" && exit 1 @@ -63,13 +68,13 @@ fi install_base() { case "${release}" in centos|fedora) - yum install -y -q wget curl tar + yum -y update && yum install -y -q wget curl tar ;; arch) pacman -Syu --noconfirm wget curl tar ;; *) - apt install -y -q wget curl tar + apt-get update && apt-get upgrade -y && apt install -y -q wget curl tar ;; esac } @@ -114,20 +119,20 @@ install_x-ui() { cd /usr/local/ if [ $# == 0 ]; then - last_version=$(curl -Ls "https://api.github.com/repos/MHSanaei/3x-ui/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/') + last_version=$(curl -Ls "https://api.github.com/repos/quydang04/x-ui-dev/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/') if [[ ! -n "$last_version" ]]; then echo -e "${red}Failed to fetch x-ui version, it maybe due to Github API restrictions, please try it later${plain}" exit 1 fi echo -e "Got x-ui latest version: ${last_version}, beginning the installation..." - wget -N --no-check-certificate -O /usr/local/x-ui-linux-$(arch3xui).tar.gz https://github.com/MHSanaei/3x-ui/releases/download/${last_version}/x-ui-linux-$(arch3xui).tar.gz + wget -N --no-check-certificate -O /usr/local/x-ui-linux-$(arch3xui).tar.gz https://github.com/quydang04/x-ui-dev/releases/download/${last_version}/x-ui-linux-$(arch3xui).tar.gz if [[ $? -ne 0 ]]; then echo -e "${red}Downloading x-ui failed, please be sure that your server can access Github ${plain}" exit 1 fi else last_version=$1 - url="https://github.com/MHSanaei/3x-ui/releases/download/${last_version}/x-ui-linux-$(arch3xui).tar.gz" + url="https://github.com/quydang04/x-ui-dev/releases/download/${last_version}/x-ui-linux-$(arch3xui).tar.gz" echo -e "Begining to install x-ui $1" wget -N --no-check-certificate -O /usr/local/x-ui-linux-$(arch3xui).tar.gz ${url} if [[ $? -ne 0 ]]; then @@ -146,7 +151,7 @@ install_x-ui() { cd x-ui chmod +x x-ui bin/xray-linux-$(arch3xui) cp -f x-ui.service /etc/systemd/system/ - wget --no-check-certificate -O /usr/bin/x-ui https://raw.githubusercontent.com/MHSanaei/3x-ui/main/x-ui.sh + wget --no-check-certificate -O /usr/bin/x-ui https://raw.githubusercontent.com/quydang04/x-ui/main/x-ui.sh chmod +x /usr/local/x-ui/x-ui.sh chmod +x /usr/bin/x-ui config_after_install