From 552bc6c1f60e200403e653f8ffbe3abbd31ca404 Mon Sep 17 00:00:00 2001
From: Leonardo <parsdade@gmail.com>
Date: Sat, 11 Mar 2023 15:27:26 +0330
Subject: [PATCH 1/4] Update x-ui.sh

Fix Fedora OS
---
 x-ui.sh | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/x-ui.sh b/x-ui.sh
index 03432c31..f3b33910 100644
--- a/x-ui.sh
+++ b/x-ui.sh
@@ -21,42 +21,44 @@ function LOGI() {
 [[ $EUID -ne 0 ]] && LOGE "ERROR: You must be root to run this script! \n" && exit 1
 
 # check os
-if [[ -f /etc/redhat-release ]]; then
-    release="centos"
-elif cat /etc/issue | grep -Eqi "debian"; then
+if cat /etc/issue | grep -Eqi "debian"; then
     release="debian"
 elif cat /etc/issue | grep -Eqi "ubuntu"; then
     release="ubuntu"
-elif cat /etc/issue | grep -Eqi "centos|red hat|redhat"; then
+elif cat /etc/issue | grep -Eqi "centos"; then
     release="centos"
+elif cat /etc/issue | grep -Eqi "fedora"; then
+    release="fedora"
 elif cat /proc/version | grep -Eqi "debian"; then
     release="debian"
 elif cat /proc/version | grep -Eqi "ubuntu"; then
     release="ubuntu"
-elif cat /proc/version | grep -Eqi "centos|red hat|redhat"; then
+elif cat /proc/version | grep -Eqi "centos"; then
     release="centos"
+elif cat /proc/version | grep -Eqi "fedora"; then
+    release="fedora"
 else
     LOGE "check system OS failed,please contact with author! \n" && exit 1
 fi
 
-os_version=""
-
 # os version
-if [[ -f /etc/os-release ]]; then
-    os_version=$(awk -F'[= ."]' '/VERSION_ID/{print $3}' /etc/os-release)
-fi
-if [[ -z "$os_version" && -f /etc/lsb-release ]]; then
-    os_version=$(awk -F'[= ."]+' '/DISTRIB_RELEASE/{print $2}' /etc/lsb-release)
-fi
+os_version=""
+os_version=$(grep -i version_id /etc/os-release | cut -d \" -f2 | cut -d . -f1)
 
 if [[ x"${release}" == x"centos" ]]; then
-    if [[ ${os_version} -le 6 ]]; then
-        LOGE "please use CentOS 7 or higher version! \n" && exit 1
+    if [[ ${os_version} -le 7 ]]; then
+        echo -e "${red} Please use CentOS 8 or higher ${plain}\n" && exit 1
     fi
 elif [[ x"${release}" == x"ubuntu" ]]; then
     if [[ ${os_version} -lt 16 ]]; then
         LOGE "please use Ubuntu 16 or higher version！\n" && exit 1
     fi
+    
+elif [[ x"${release}" == x"fedora" ]]; then
+    if [[ ${os_version} -lt 29 ]]; then
+        LOGE "please use Fedora 29 or higher version！\n" && exit 1
+    fi
+
 elif [[ x"${release}" == x"debian" ]]; then
     if [[ ${os_version} -lt 8 ]]; then
         LOGE "please use Debian 8 or higher version！\n" && exit 1

From 0218af8b4f32e85d9434ffcc3f99a18a313acfde Mon Sep 17 00:00:00 2001
From: Leonardo <parsdade@gmail.com>
Date: Sat, 11 Mar 2023 15:28:56 +0330
Subject: [PATCH 2/4] Update install.sh

Fix Fedora OS
---
 install.sh | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/install.sh b/install.sh
index 40714ff0..9869ac54 100755
--- a/install.sh
+++ b/install.sh
@@ -11,22 +11,24 @@ cur_dir=$(pwd)
 [[ $EUID -ne 0 ]] && echo -e "${red}Fatal error：${plain} Please run this script with root privilege \n " && exit 1
 
 # check os
-if [[ -f /etc/redhat-release ]]; then
-    release="centos"
-elif cat /etc/issue | grep -Eqi "debian"; then
+if cat /etc/issue | grep -Eqi "debian"; then
     release="debian"
 elif cat /etc/issue | grep -Eqi "ubuntu"; then
     release="ubuntu"
-elif cat /etc/issue | grep -Eqi "centos|red hat|redhat"; then
+elif cat /etc/issue | grep -Eqi "centos"; then
     release="centos"
+elif cat /etc/issue | grep -Eqi "fedora"; then
+    release="fedora"
 elif cat /proc/version | grep -Eqi "debian"; then
     release="debian"
 elif cat /proc/version | grep -Eqi "ubuntu"; then
     release="ubuntu"
-elif cat /proc/version | grep -Eqi "centos|red hat|redhat"; then
+elif cat /proc/version | grep -Eqi "centos"; then
     release="centos"
+elif cat /proc/version | grep -Eqi "fedora"; then
+    release="fedora"
 else
-    echo -e "${red} Check system OS failed, please contact the author! ${plain}\n" && exit 1
+    LOGE "check system OS failed,please contact with author! \n" && exit 1
 fi
 
 arch=$(arch)
@@ -49,27 +51,27 @@ if [ $(getconf WORD_BIT) != '32' ] && [ $(getconf LONG_BIT) != '64' ]; then
     exit -1
 fi
 
-os_version=""
-
 # os version
-if [[ -f /etc/os-release ]]; then
-    os_version=$(awk -F'[= ."]' '/VERSION_ID/{print $3}' /etc/os-release)
-fi
-if [[ -z "$os_version" && -f /etc/lsb-release ]]; then
-    os_version=$(awk -F'[= ."]+' '/DISTRIB_RELEASE/{print $2}' /etc/lsb-release)
-fi
+os_version=""
+os_version=$(grep -i version_id /etc/os-release | cut -d \" -f2 | cut -d . -f1)
 
 if [[ x"${release}" == x"centos" ]]; then
-    if [[ ${os_version} -le 6 ]]; then
-        echo -e "${red} Please use CentOS 7 or higher version ${plain}\n" && exit 1
+    if [[ ${os_version} -le 7 ]]; then
+        echo -e "${red} Please use CentOS 8 or higher ${plain}\n" && exit 1
     fi
 elif [[ x"${release}" == x"ubuntu" ]]; then
     if [[ ${os_version} -lt 16 ]]; then
-        echo -e "${red} Please use Ubuntu 16 or higher version ${plain}\n" && exit 1
+        LOGE "please use Ubuntu 16 or higher version！\n" && exit 1
     fi
+    
+elif [[ x"${release}" == x"fedora" ]]; then
+    if [[ ${os_version} -lt 29 ]]; then
+        LOGE "please use Fedora 29 or higher version！\n" && exit 1
+    fi
+
 elif [[ x"${release}" == x"debian" ]]; then
     if [[ ${os_version} -lt 8 ]]; then
-        echo -e "${red} Please use Debian 8 or higher version ${plain}\n" && exit 1
+        LOGE "please use Debian 8 or higher version！\n" && exit 1
     fi
 fi
 

From e6460d1d00210b0d3265883354558f99bfac27de Mon Sep 17 00:00:00 2001
From: Leonardo <parsdade@gmail.com>
Date: Sat, 11 Mar 2023 15:29:43 +0330
Subject: [PATCH 3/4] Update README.md

Added Fedora OS
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index b6a1fb41..244c46c7 100644
--- a/README.md
+++ b/README.md
@@ -149,6 +149,7 @@ Reference syntax:
 - CentOS 7+
 - Ubuntu 16+
 - Debian 8+
+- Fedora 29+
 
 # common problem
 

From 68a7b381173a5fb9cadd42c3b5b184f33e6f5f60 Mon Sep 17 00:00:00 2001
From: Alireza Ahmadi <alireza7@gmail.com>
Date: Mon, 13 Mar 2023 11:36:37 +0100
Subject: [PATCH 4/4] Revert "Added Fedora OS Support"

---
 README.md  |  1 -
 install.sh | 38 ++++++++++++++++++--------------------
 x-ui.sh    | 32 +++++++++++++++-----------------
 3 files changed, 33 insertions(+), 38 deletions(-)

diff --git a/README.md b/README.md
index 244c46c7..b6a1fb41 100644
--- a/README.md
+++ b/README.md
@@ -149,7 +149,6 @@ Reference syntax:
 - CentOS 7+
 - Ubuntu 16+
 - Debian 8+
-- Fedora 29+
 
 # common problem
 
diff --git a/install.sh b/install.sh
index 9869ac54..40714ff0 100755
--- a/install.sh
+++ b/install.sh
@@ -11,24 +11,22 @@ cur_dir=$(pwd)
 [[ $EUID -ne 0 ]] && echo -e "${red}Fatal error：${plain} Please run this script with root privilege \n " && exit 1
 
 # check os
-if cat /etc/issue | grep -Eqi "debian"; then
+if [[ -f /etc/redhat-release ]]; then
+    release="centos"
+elif cat /etc/issue | grep -Eqi "debian"; then
     release="debian"
 elif cat /etc/issue | grep -Eqi "ubuntu"; then
     release="ubuntu"
-elif cat /etc/issue | grep -Eqi "centos"; then
+elif cat /etc/issue | grep -Eqi "centos|red hat|redhat"; then
     release="centos"
-elif cat /etc/issue | grep -Eqi "fedora"; then
-    release="fedora"
 elif cat /proc/version | grep -Eqi "debian"; then
     release="debian"
 elif cat /proc/version | grep -Eqi "ubuntu"; then
     release="ubuntu"
-elif cat /proc/version | grep -Eqi "centos"; then
+elif cat /proc/version | grep -Eqi "centos|red hat|redhat"; then
     release="centos"
-elif cat /proc/version | grep -Eqi "fedora"; then
-    release="fedora"
 else
-    LOGE "check system OS failed,please contact with author! \n" && exit 1
+    echo -e "${red} Check system OS failed, please contact the author! ${plain}\n" && exit 1
 fi
 
 arch=$(arch)
@@ -51,27 +49,27 @@ if [ $(getconf WORD_BIT) != '32' ] && [ $(getconf LONG_BIT) != '64' ]; then
     exit -1
 fi
 
-# os version
 os_version=""
-os_version=$(grep -i version_id /etc/os-release | cut -d \" -f2 | cut -d . -f1)
+
+# os version
+if [[ -f /etc/os-release ]]; then
+    os_version=$(awk -F'[= ."]' '/VERSION_ID/{print $3}' /etc/os-release)
+fi
+if [[ -z "$os_version" && -f /etc/lsb-release ]]; then
+    os_version=$(awk -F'[= ."]+' '/DISTRIB_RELEASE/{print $2}' /etc/lsb-release)
+fi
 
 if [[ x"${release}" == x"centos" ]]; then
-    if [[ ${os_version} -le 7 ]]; then
-        echo -e "${red} Please use CentOS 8 or higher ${plain}\n" && exit 1
+    if [[ ${os_version} -le 6 ]]; then
+        echo -e "${red} Please use CentOS 7 or higher version ${plain}\n" && exit 1
     fi
 elif [[ x"${release}" == x"ubuntu" ]]; then
     if [[ ${os_version} -lt 16 ]]; then
-        LOGE "please use Ubuntu 16 or higher version！\n" && exit 1
+        echo -e "${red} Please use Ubuntu 16 or higher version ${plain}\n" && exit 1
     fi
-    
-elif [[ x"${release}" == x"fedora" ]]; then
-    if [[ ${os_version} -lt 29 ]]; then
-        LOGE "please use Fedora 29 or higher version！\n" && exit 1
-    fi
-
 elif [[ x"${release}" == x"debian" ]]; then
     if [[ ${os_version} -lt 8 ]]; then
-        LOGE "please use Debian 8 or higher version！\n" && exit 1
+        echo -e "${red} Please use Debian 8 or higher version ${plain}\n" && exit 1
     fi
 fi
 
diff --git a/x-ui.sh b/x-ui.sh
index f3b33910..03432c31 100644
--- a/x-ui.sh
+++ b/x-ui.sh
@@ -21,44 +21,42 @@ function LOGI() {
 [[ $EUID -ne 0 ]] && LOGE "ERROR: You must be root to run this script! \n" && exit 1
 
 # check os
-if cat /etc/issue | grep -Eqi "debian"; then
+if [[ -f /etc/redhat-release ]]; then
+    release="centos"
+elif cat /etc/issue | grep -Eqi "debian"; then
     release="debian"
 elif cat /etc/issue | grep -Eqi "ubuntu"; then
     release="ubuntu"
-elif cat /etc/issue | grep -Eqi "centos"; then
+elif cat /etc/issue | grep -Eqi "centos|red hat|redhat"; then
     release="centos"
-elif cat /etc/issue | grep -Eqi "fedora"; then
-    release="fedora"
 elif cat /proc/version | grep -Eqi "debian"; then
     release="debian"
 elif cat /proc/version | grep -Eqi "ubuntu"; then
     release="ubuntu"
-elif cat /proc/version | grep -Eqi "centos"; then
+elif cat /proc/version | grep -Eqi "centos|red hat|redhat"; then
     release="centos"
-elif cat /proc/version | grep -Eqi "fedora"; then
-    release="fedora"
 else
     LOGE "check system OS failed,please contact with author! \n" && exit 1
 fi
 
-# os version
 os_version=""
-os_version=$(grep -i version_id /etc/os-release | cut -d \" -f2 | cut -d . -f1)
+
+# os version
+if [[ -f /etc/os-release ]]; then
+    os_version=$(awk -F'[= ."]' '/VERSION_ID/{print $3}' /etc/os-release)
+fi
+if [[ -z "$os_version" && -f /etc/lsb-release ]]; then
+    os_version=$(awk -F'[= ."]+' '/DISTRIB_RELEASE/{print $2}' /etc/lsb-release)
+fi
 
 if [[ x"${release}" == x"centos" ]]; then
-    if [[ ${os_version} -le 7 ]]; then
-        echo -e "${red} Please use CentOS 8 or higher ${plain}\n" && exit 1
+    if [[ ${os_version} -le 6 ]]; then
+        LOGE "please use CentOS 7 or higher version! \n" && exit 1
     fi
 elif [[ x"${release}" == x"ubuntu" ]]; then
     if [[ ${os_version} -lt 16 ]]; then
         LOGE "please use Ubuntu 16 or higher version！\n" && exit 1
     fi
-    
-elif [[ x"${release}" == x"fedora" ]]; then
-    if [[ ${os_version} -lt 29 ]]; then
-        LOGE "please use Fedora 29 or higher version！\n" && exit 1
-    fi
-
 elif [[ x"${release}" == x"debian" ]]; then
     if [[ ${os_version} -lt 8 ]]; then
         LOGE "please use Debian 8 or higher version！\n" && exit 1