From 4136f8e68654557cb757cd897be920a95c05c7e9 Mon Sep 17 00:00:00 2001
From: qtwrk <qtwrk@qtwrkdeMacBook-Pro.local>
Date: Fri, 20 Dec 2019 15:29:18 +0100
Subject: [PATCH] default to python3 on centos8

---
 .DS_Store     | Bin 0 -> 10244 bytes
 cyberpanel.sh |   7 ++++---
 2 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..7aa1d3f5dd59f9ec714b993c91ec60ed40781603
GIT binary patch
literal 10244
zcmeHMO>g5=6uoZJ)cKkQ4N}D}8>CrOQ3KKpBQzqDwunjvMPy(WfI7|xiK%0U#F?~H
zin2lch2bY4{s=q7iXVbl!@1XPc<*^yb_mhu%Dzr=&-*y{p8Nb<B68Y`L6fLXL@rLY
zwF)k;IQVxyGsi~y%>!5mc%m`wQ$!)fG|PC~FDwI=0n318z%pPN_%ASkHJcB&oLGCc
z3|Iy%18WAjKGbotZKZaVSScO2$QA%LkFVvxJ@x^Dsi(G;+Ero&iZ+wogOfs?bc^96
zaQt3pci2{HSBXvF<Rox%(w?1khvG=@z}3Z_oK|A()iPii$TGlt_icJiQ}U><?cXB`
z@HeE{Q4sZeLDYjMi|bvS_x_XvcSJcLr{o)6KN?;I>PZi$w4kZ(>+Bf574e;;?<Y7X
zXgvTnrlEoR&cNj`gTNe#^Sj|y#5;;(`VcLKI7itTZg>X5m3AYHd;q38bfk}C;}^rf
z2LI$Oh(|tp0f(?JWDY+6qT_Rq4Ez>Gcn%I2w@)3z`zOQuHS~7n%~9n30&0La?z=%>
z(OhpK|Ax^*^_mvuG&Ydm8^|IU;mCOFh?#x;VIXoqgyx7g`-WE)UJ*uhDjeJptIb~x
z<Q*U;7>^GQ7&ntPV&P(>&!+I6fvqUm4v^fEkEl;{oG9R>qJSzq&(K$rsY7H)0Mv;4
zG?1(c6<MY)Wu(cNugOQzhl+9q#p7F|SEy9)#bI5j{yF%^8P%~aRIeJ;?_<<s<oNTH
zL5?dk=>vbR_aZ7$@g+J!Wc$<xmLmt9n{gJU=orq?f$-Nr&oMYOW+UoQF<Tf7GDxy6
zGxr>;;|A~Eaz0IK+0VUc;Lqc|z2BUTTz<2#<+>%eR4skc9Y@P<?8S?D+nasHpE_PV
z?xpunq9|D3d%aKn;qs*R`hFC~o*xcp0`><(xP1Q94+qh*9WBDaT-xa-Ke%quEuPeN
zE-v<V>&<5Ka<_ibeDLtC-TK3K?q6OO-JLg^kB**A&R<-7bNTH{%m{~*KKP(o>&FlH
zXmIkpI}3v-95GCOJw|Ny>5x96E*<J|lxm<dRzSR2dz@KD#m%$+Ro}AsN~WXbbBPLa
z+3105fQl-u71~AQXUMk9DkBv^#S{f|rH}@4%g9Hm1lJ=v^nqDPMgJ<|j@HN3*nDs?
zG&7lNfa5APKp$ThY#i$>5VWr$T+AU+O0o(Wm6KJU@#n}e+Y%kUeOA5ZUy*e)twWeS
zuji~ZV?F2fQNwL(IM(!9Ygsf`0S$c@=tvM;+0MYjFje>rb&<!wqc>v5bwO*TidMM3
zeF8heohKu2pj~4{;_9Fwi}W$_{4pJ%`X9<FIM8|G3ZWskrKhh^uYBB1WV|tYYM{cL
zQLLj`EgHHA&$n-?d8`=?Q37I}^>`BDh#IlaLophrqG7sH`(ljPz_DsH++E;KF|UwL
zz&iYaj4(&-X(ZDM)>N&Pg5Y?aN9=SySVNkx3oobzSJvp*Ty;b@XNqpN6#q<gMKh{*
z0p1JDhG%4~=AswXw*=3B$R5#*im3`m9G$<PIns>K=PjyHk>#X{VdnCL_v-8swWz2X
zR`4O#SVl2#@5}7^xKCO!;ww5)@nw1{cz#ai++|)+xAn1#MpP8au{|sUmVsN&KrWeo
zo!|c-UjP69Th5Z5zGdM5&480X=pM8&$Ez)-IbD9&UdQ<iCm-y$N~}O|k=OCC@;V+L
t_;vg}ob0>DmJi&wQoBklzQOUY|1+S6PVN3*-sjr=Kkr5)4R6){|1Y4u5l{dC

literal 0
HcmV?d00001

diff --git a/cyberpanel.sh b/cyberpanel.sh
index 709ef68f5..258bcd916 100644
--- a/cyberpanel.sh
+++ b/cyberpanel.sh
@@ -393,7 +393,7 @@ if [[ $SERVER_OS == "CentOS" ]] ; 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 [[ $CENTOS_8 == "True" ]] ; then
-		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 tar
+		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 tar python36
 		dnf --enablerepo=PowerTools install gpgme-devel -y
 	fi
 
@@ -799,7 +799,8 @@ COMMENT
 
 #if [[ $DEV_ARG == "ON" ]] ; then
 echo -e "Press \e[31mEnter\e[39m to continue with stable version of CyberPanel, or"
-echo -e "\nPlease enter \e[31mbeta\e[39m and then press \e[31mEnter\e[39m to install CyberPanel with Python 3 (which also supports Centos 8)."
+echo -e "\nPlease enter \e[31mbeta\e[39m and then press \e[31mEnter\e[39m to install CyberPanel with Python 3."
+echo -e "\nCentOS 8 will autoamtically proceed with Python 3 branch."
 printf "%s" ""
 read TMP_YN
 
@@ -1363,4 +1364,4 @@ pip_virtualenv
 
 system_tweak
 
-main_install
\ No newline at end of file
+main_install