@@ -27,6 +27,17 @@ CENTOS_8="False"
2727WATCHDOG=" OFF"
2828BRANCH_NAME=" stable"
2929
30+ check_return () {
31+ # check previous command result , 0 = ok , non-0 = something wrong.
32+ if [[ $? -eq " 0" ]] ; then
33+ :
34+ else
35+ echo -e " \ncommand failed, exiting..."
36+ exit
37+ fi
38+ }
39+
40+
3041watchdog_setup () {
3142if [[ $WATCHDOG == " ON" ]] ; then
3243wget -O /etc/cyberpanel/watchdog.sh https://$DOWNLOAD_SERVER /misc/watchdog.sh
@@ -418,10 +429,13 @@ if [[ $SERVER_OS == "CentOS" ]] ; then
418429
419430 if [[ $CENTOS_8 == " False" ]] ; then
420431 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
421- fi
432+ check_return
433+ fi
422434 if [[ $CENTOS_8 == " True" ]] ; then
423435 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
436+ check_return
424437 dnf --enablerepo=PowerTools install gpgme-devel -y
438+ check_return
425439 fi
426440
427441if [[ $DEV == " ON" ]] ; then
@@ -430,22 +444,29 @@ if [[ $DEV == "ON" ]] ; then
430444 yum -y groupinstall development
431445 yum -y install https://centos7.iuscommunity.org/ius-release.rpm
432446 yum -y install python36u python36u-pip python36u-devel
447+ check_return
433448 fi
434449 if [[ $CENTOS_8 == " True" ]] ; then
435450 dnf install python3 -y
451+ check_return
436452 fi
437453 pip3.6 install virtualenv
454+ check_return
438455 fi
439456fi
440457
441458if [[ $SERVER_OS == " Ubuntu" ]] ; then
442459 apt update -y
443460 DEBIAN_FRONTEND=noninteractive apt upgrade -y
444461 DEBIAN_FRONTEND=noninteracitve apt install -y htop telnet python-mysqldb python-dev libcurl4-gnutls-dev libgnutls28-dev libgcrypt20-dev libattr1 libattr1-dev liblzma-dev libgpgme-dev libmariadbclient-dev libcurl4-gnutls-dev libssl-dev nghttp2 libnghttp2-dev idn2 libidn2-dev libidn2-0-dev librtmp-dev libpsl-dev nettle-dev libgnutls28-dev libldap2-dev libgssapi-krb5-2 libk5crypto3 libkrb5-dev libcomerr2 libldap2-dev python-gpg python python-minimal python-setuptools virtualenv python-dev python-pip git
462+ check_return
445463 if [[ $DEV == " ON" ]] ; then
446464 DEBIAN_FRONTEND=noninteractive apt install -y python3-pip
465+ check_return
447466 DEBIAN_FRONTEND=noninteractive apt install -y build-essential libssl-dev libffi-dev python3-dev
467+ check_return
448468 DEBIAN_FRONTEND=noninteractive apt install -y python3-venv
469+ check_return
449470 fi
450471fi
451472}
@@ -1007,6 +1028,7 @@ source /usr/local/CyberPanel/bin/activate
10071028rm -rf requirements.txt
10081029wget -O requirements.txt https://raw.githubusercontent.com/usmannasir/cyberpanel/1.8.0/requirments.txt
10091030pip install --ignore-installed -r requirements.txt
1031+ check_return
10101032virtualenv --system-site-packages /usr/local/CyberPanel
10111033fi
10121034
@@ -1018,6 +1040,7 @@ if [[ $DEV == "ON" ]] ; then
10181040 source /usr/local/CyberPanel/bin/activate
10191041 wget -O requirements.txt https://raw.githubusercontent.com/usmannasir/cyberpanel/$BRANCH_NAME /requirments.txt
10201042 pip3.6 install --ignore-installed -r requirements.txt
1043+ check_return
10211044 cd -
10221045fi
10231046
@@ -1075,6 +1098,7 @@ virtualenv -p /usr/bin/python3 /usr/local/CyberCP
10751098source /usr/local/CyberCP/bin/activate
10761099wget -O requirements.txt https://raw.githubusercontent.com/usmannasir/cyberpanel/$BRANCH_NAME /requirments.txt
10771100pip3.6 install --ignore-installed -r requirements.txt
1101+ check_return
10781102systemctl restart lscpd
10791103fi
10801104
0 commit comments