From baa25da3bb46928c1b3f283895de1f03bcf40def Mon Sep 17 00:00:00 2001
From: Usman Nasir <usman@cyberpersons.com>
Date: Wed, 18 Dec 2019 13:06:08 +0500
Subject: [PATCH] update: install.py

---
 cyberpanel.sh      | 14 ++++++--------
 install/install.py |  4 ++--
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/cyberpanel.sh b/cyberpanel.sh
index 17062faef..629b15a77 100644
--- a/cyberpanel.sh
+++ b/cyberpanel.sh
@@ -20,6 +20,7 @@ ADMIN_PASS="1234567"
 MEMCACHED="ON"
 REDIS="ON"
 TOTAL_RAM=$(free -m | awk '/Mem\:/ { print $2 }')
+CENT_8="False"
 
 license_validation() {
 CURRENT_DIR=$(pwd)
@@ -337,13 +338,12 @@ if [[ $SERVER_OS == "CentOS" ]] ; then
 	yum clean all
 	yum update -y
 	yum install epel-release -y
-	yum install -y wget strace htop net-tools telnet curl which bc telnet htop libevent-devel gcc python-devel libattr-devel xz-devel gpgme-devel mariadb-devel curl-devel python-pip git
-
+	if [[ $CENT_8 == "False" ]] ; then
+	  yum install -y wget strace htop net-tools telnet curl which bc telnet htop libevent-devel gcc python-devel libattr-devel xz-devel gpgme-devel mariadb-devel curl-devel python-pip git
+  fi
 	if [[ $CENT_8 == "True" ]] ; then
-		yum -y install platform-python-devel
+		yum install -y wget strace htop net-tools telnet curl which bc telnet htop libevent-devel gcc libattr-devel xz-devel mariadb-devel curl-devel git platform-python-devel
 		dnf --enablerepo=PowerTools install gpgme-devel -y
-		yum -y install python3-pip
-		yum install wget -y
 	fi
 
 	if [[ $DEV == "ON" ]] ; then
@@ -479,8 +479,6 @@ if [ "$(cat /sys/devices/virtual/dmi/id/product_uuid | cut -c 1-3)" = 'EC2' ] &&
 fi
 
 }
-
-CENT_8="False"
 check_OS() {
 echo -e "\nChecking OS..."
 OUTPUT=$(cat /etc/*release)
@@ -496,7 +494,7 @@ elif echo $OUTPUT | grep -q "Ubuntu 18.04" ; then
 	SERVER_OS="Ubuntu"
 elif echo $OUTPUT | grep -q "CentOS Linux 8" ; then
 	echo -e "\nDetecting Centos 8...\n"
-	SERVER_OS="Centos8"
+	SERVER_OS="CentOS"
 	CENT_8="True"
 else
 	cat /etc/*release
diff --git a/install/install.py b/install/install.py
index 2f49760d2..912698afc 100755
--- a/install/install.py
+++ b/install/install.py
@@ -359,7 +359,7 @@ class preFlightsChecks:
                 preFlightsChecks.stdOut("[ERROR] Exception during CyberPanel install")
                 os._exit(os.EX_SOFTWARE)
 
-        else:
+        elif self.distro == cent8:
             command = 'rpm -ivh http://rpms.litespeedtech.com/centos/litespeed-repo-1.1-1.el7.noarch.rpm'
             preFlightsChecks.call(command, self.distro, command, command, 1, 1, os.EX_OSERR)
 
@@ -382,7 +382,7 @@ class preFlightsChecks:
 
         if self.distro == centos:
             command = "yum -y install python-devel"
-        else:
+        elif self.distro == ubuntu:
             command = "apt-get -y install python-dev"
 
         preFlightsChecks.call(command, self.distro, command, command, 1, 1, os.EX_OSERR)