diff --git a/cyberpanel.sh b/cyberpanel.sh index 968cf79bc..e64e6422d 100644 --- a/cyberpanel.sh +++ b/cyberpanel.sh @@ -480,13 +480,13 @@ fi install_required() { echo -e "\nInstalling necessary components..." if [[ $SERVER_OS == "CentOS" ]] ; then - rpm --import https://$DOWNLOAD_SERVER/mariadb/RPM-GPG-KEY-MariaDB - rpm --import https://$DOWNLOAD_SERVER/litespeed/RPM-GPG-KEY-litespeed - rpm --import https://$DOWNLOAD_SERVER/powerdns/FD380FBB-pub.asc - rpm --import http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7 - rpm --import https://$DOWNLOAD_SERVER/gf-plus/RPM-GPG-KEY-gf.el7 - rpm --import https://repo.dovecot.org/DOVECOT-REPO-GPG - rpm --import https://copr-be.cloud.fedoraproject.org/results/copart/restic/pubkey.gpg + timeout 10 rpm --import https://$DOWNLOAD_SERVER/mariadb/RPM-GPG-KEY-MariaDB + timeout 10 rpm --import https://$DOWNLOAD_SERVER/litespeed/RPM-GPG-KEY-litespeed + timeout 10 rpm --import https://$DOWNLOAD_SERVER/powerdns/FD380FBB-pub.asc + timeout 10 rpm --import http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7 + timeout 10 rpm --import https://$DOWNLOAD_SERVER/gf-plus/RPM-GPG-KEY-gf.el7 + timeout 10 rpm --import https://repo.dovecot.org/DOVECOT-REPO-GPG + timeout 10 rpm --import https://copr-be.cloud.fedoraproject.org/results/copart/restic/pubkey.gpg yum clean all yum update -y yum autoremove epel-release -y @@ -646,9 +646,11 @@ else PROVIDER='undefined' fi +if [[ -f /sys/devices/virtual/dmi/id/product_uuid ]] ; then if [ "$(cat /sys/devices/virtual/dmi/id/product_uuid | cut -c 1-3)" = 'EC2' ] && [ -d /home/ubuntu ]; then PROVIDER='Amazon Web Service' fi +fi } diff --git a/cyberpanel_upgrade.sh b/cyberpanel_upgrade.sh index dc52f042b..311114562 100644 --- a/cyberpanel_upgrade.sh +++ b/cyberpanel_upgrade.sh @@ -8,6 +8,39 @@ OUTPUT=$(cat /etc/*release) TEMP=$(curl --silent https://cyberpanel.net/version.txt) BRANCH_NAME=v${TEMP:12:3}.${TEMP:25:1} +input_branch() { + echo -e "\nPress Enter key to continue with latest version or Enter specific version such as: \e[31m1.9.4\e[39m , \e[31m1.9.5\e[39m ...etc" + echo -e "\nIf nothing is input in 10 seconds , script will proceed with latest stable. " + echo -e "\nPlease press Enter key , or specify a version number ,or wait for 10 seconds timeout: " + printf "%s" "" + read -t 10 TMP_YN + + if [[ $TMP_YN == "" ]] ; then + BRANCH_NAME="v${TEMP:12:3}.${TEMP:25:1}" + echo -e "\nBranch name set to $BRANCH_NAME" + else + base_number="1.9.3" + if [[ $TMP_YN == *.*.* ]] ; then + #check input if it's valid format as X.Y.Z + output=$(awk -v num1="$base_number" -v num2="$TMP_YN" ' + BEGIN { + print "num1", (num1 < num2 ? "<" : ">="), "num2" + } + ') + if [[ $output == *">="* ]] ; then + echo -e "\nYou must use version number higher than 1.9.4" + exit + else + BRANCH_NAME="v$TMP_YN" + echo "set branch name to $BRANCH_NAME" + fi + else + echo -e "\nPlease input a valid format version number." + exit + fi + fi +} + install_utility() { if [[ ! -f /usr/bin/cyberpanel_utility ]] ; then wget -q -O /usr/bin/cyberpanel_utility https://cyberpanel.sh/misc/cyberpanel_utility.sh @@ -42,6 +75,8 @@ else fi } +input_branch + check_root echo -e "\nChecking OS..." @@ -100,7 +135,7 @@ fi rm -rf /usr/local/CyberPanel virtualenv -p /usr/bin/python3 --system-site-packages /usr/local/CyberPanel check_return -rm -rf requirments.txt +rm -f requirments.txt wget https://raw.githubusercontent.com/usmannasir/cyberpanel/$BRANCH_NAME/requirments.txt . /usr/local/CyberPanel/bin/activate check_return @@ -216,6 +251,15 @@ fi ## systemctl restart lscpd +rm -f requirements.txt +rm -f requirments.txt +rm -f upgrade.py +rm -rf wsgi-lsapi-1.5 +rm -f wsgi-lsapi-1.5.tgz +rm -f /usr/local/composer.sh + +# clean up + echo "###################################################################" echo " CyberPanel Upgraded " echo "###################################################################" diff --git a/locale/fr/LC_MESSAGES/django.mo b/locale/fr/LC_MESSAGES/django.mo index bae090554..494aa8fe4 100755 Binary files a/locale/fr/LC_MESSAGES/django.mo and b/locale/fr/LC_MESSAGES/django.mo differ diff --git a/locale/it/LC_MESSAGES/django.mo b/locale/it/LC_MESSAGES/django.mo index e1b331813..558350836 100755 Binary files a/locale/it/LC_MESSAGES/django.mo and b/locale/it/LC_MESSAGES/django.mo differ diff --git a/locale/pl/LC_MESSAGES/django.mo b/locale/pl/LC_MESSAGES/django.mo index 51103f8ae..d01a61b53 100755 Binary files a/locale/pl/LC_MESSAGES/django.mo and b/locale/pl/LC_MESSAGES/django.mo differ diff --git a/locale/pt/LC_MESSAGES/django.mo b/locale/pt/LC_MESSAGES/django.mo index 705f69545..8700c1561 100755 Binary files a/locale/pt/LC_MESSAGES/django.mo and b/locale/pt/LC_MESSAGES/django.mo differ diff --git a/locale/pt/LC_MESSAGES/django.po b/locale/pt/LC_MESSAGES/django.po index 2f006d057..fdf3601b3 100755 --- a/locale/pt/LC_MESSAGES/django.po +++ b/locale/pt/LC_MESSAGES/django.po @@ -6468,7 +6468,7 @@ msgstr "Detalhes do Website" #: websiteFunctions/templates/websiteFunctions/createWebsite.html:54 msgid "Do not enter WWW, it will be auto created!" -msgstr "" +msgstr "Não digite WWW, ele será criado automaticamente!" #: websiteFunctions/templates/websiteFunctions/deleteWebsite.html:3 msgid "Delete Website - CyberPanel" diff --git a/locale/tr/LC_MESSAGES/django.mo b/locale/tr/LC_MESSAGES/django.mo index 553ce80ba..34df2631c 100755 Binary files a/locale/tr/LC_MESSAGES/django.mo and b/locale/tr/LC_MESSAGES/django.mo differ