From c2f7032d884e5e34e9f71dadc9dc70b41c55b920 Mon Sep 17 00:00:00 2001
From: Aaron <18094530+aaronsmile@users.noreply.github.com>
Date: Sat, 25 Jun 2022 21:27:41 +0800
Subject: [PATCH] fix system identification and installation bugs

---
 cyberpanel.sh      |  2 ++
 install/install.py | 15 ++++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/cyberpanel.sh b/cyberpanel.sh
index 64a4928b8..0246e6915 100644
--- a/cyberpanel.sh
+++ b/cyberpanel.sh
@@ -1504,6 +1504,7 @@ if [[ $Server_OS = "Ubuntu" ]]; then
 fi
 if [[ $Server_OS = "openEuler" ]]; then
   #yum install -y lsphp??-memcached lsphp??-pecl-memcached
+  echo -e "\nMemcached process and its PHP extensions for openEuler are in process of packaging...\n"
   if [[ $Total_RAM -eq "2048" ]] || [[ $Total_RAM -gt "2048" ]]; then
     Post_Install_Addon_Mecached_LSMCD
   else
@@ -1559,6 +1560,7 @@ fi
 
 if [[ "$Server_OS" = "openEuler" ]]; then
   #yum install -y lsphp??-redis redis
+  echo -e "\nRedis process and its PHP extensions for openEuler are in process of packaging...\n"
 fi
 
 if pgrep "redis" ; then
diff --git a/install/install.py b/install/install.py
index ba4b45038..bc7a17c77 100755
--- a/install/install.py
+++ b/install/install.py
@@ -58,15 +58,16 @@ def get_distro():
             return cent8
         if data.find('Rocky Linux release 8') > -1 or data.find('Rocky Linux 8') > -1 or data.find('rocky:8') > -1:
             return cent8
-        
-    elif exists("/etc/openEuler-release"):
-        distro_file = "/etc/openEuler-release"
-        distro = openeuler
 
     else:
-        logging.InstallLog.writeToFile("Can't find linux release file - fatal error")
-        preFlightsChecks.stdOut("Can't find linux release file - fatal error")
-        os._exit(os.EX_UNAVAILABLE)
+        if exists("/etc/openEuler-release"):
+            distro_file = "/etc/openEuler-release"
+            distro = openeuler
+
+        else:
+            logging.InstallLog.writeToFile("Can't find linux release file - fatal error")
+            preFlightsChecks.stdOut("Can't find linux release file - fatal error")
+            os._exit(os.EX_UNAVAILABLE)
 
     if distro == -1:
         logging.InstallLog.writeToFile("Can't find distro name in " + distro_file + " - fatal error")