diff --git a/CLScript/CLMain.py b/CLScript/CLMain.py index 2a9a13b85..8e5afdf6e 100644 --- a/CLScript/CLMain.py +++ b/CLScript/CLMain.py @@ -5,7 +5,7 @@ class CLMain(): self.path = '/usr/local/CyberCP/version.txt' #versionInfo = json.loads(open(self.path, 'r').read()) self.version = '2.3' - self.build = '4' + self.build = '5' ipFile = "/etc/cyberpanel/machineIP" f = open(ipFile) diff --git a/baseTemplate/views.py b/baseTemplate/views.py index c14896d00..2c55b3e5f 100755 --- a/baseTemplate/views.py +++ b/baseTemplate/views.py @@ -19,7 +19,7 @@ from plogical.httpProc import httpProc # Create your views here. VERSION = '2.3' -BUILD = 4 +BUILD = 5 @ensure_csrf_cookie diff --git a/install/install.py b/install/install.py index c48022117..e31500ee9 100755 --- a/install/install.py +++ b/install/install.py @@ -15,7 +15,7 @@ from stat import * import stat VERSION = '2.3' -BUILD = 4 +BUILD = 5 char_set = {'small': 'abcdefghijklmnopqrstuvwxyz', 'nums': '0123456789', 'big': 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'} diff --git a/loginSystem/views.py b/loginSystem/views.py index 13f94ec3a..ea43cd1fe 100644 --- a/loginSystem/views.py +++ b/loginSystem/views.py @@ -19,7 +19,7 @@ from django.utils import translation # Create your views here. VERSION = '2.3' -BUILD = 4 +BUILD = 5 def verifyLogin(request): diff --git a/plogical/adminPass.py b/plogical/adminPass.py index 310a97cb2..1ea24af2f 100755 --- a/plogical/adminPass.py +++ b/plogical/adminPass.py @@ -13,7 +13,7 @@ from packages.models import Package from baseTemplate.models import version VERSION = '2.3' -BUILD = 4 +BUILD = 5 if not os.geteuid() == 0: sys.exit("\nOnly root can run this script\n") diff --git a/plogical/backupUtilities.py b/plogical/backupUtilities.py index ddd055f6b..1dd8e7d22 100755 --- a/plogical/backupUtilities.py +++ b/plogical/backupUtilities.py @@ -49,7 +49,7 @@ except: pass VERSION = '2.3' -BUILD = 4 +BUILD = 5 ## I am not the monster that you think I am.. diff --git a/plogical/upgrade.py b/plogical/upgrade.py index a0f6b2e18..8728a6d92 100755 --- a/plogical/upgrade.py +++ b/plogical/upgrade.py @@ -1,3 +1,4 @@ +import json import os import os.path import sys @@ -17,7 +18,7 @@ import random import string VERSION = '2.3' -BUILD = 4 +BUILD = 5 CENTOS7 = 0 CENTOS8 = 1 @@ -667,10 +668,10 @@ $cfg['Servers'][$i]['LogoutURL'] = 'phpmyadminsignin.php?logout'; version_build = str(BUILD) try: + Content = {"version":version_number,"build":version_build} path = "/usr/local/CyberCP/version.txt" writeToFile = open(path, 'w') - writeToFile.writelines(version_number + '\n') - writeToFile.writelines(version_build) + writeToFile.write(json.dumps(Content)) writeToFile.close() except: pass @@ -3307,6 +3308,7 @@ pm.max_spare_servers = 3 ## Upgrade.downloadAndUpgrade(versionNumbring, branch) + versionNumbring = Upgrade.downloadLink() Upgrade.download_install_phpmyadmin() Upgrade.downoad_and_install_raindloop() diff --git a/serverStatus/views.py b/serverStatus/views.py index 43a453566..5443b72c6 100755 --- a/serverStatus/views.py +++ b/serverStatus/views.py @@ -26,7 +26,7 @@ EXPIRE = 3 ### Version VERSION = '2.3' -BUILD = 4 +BUILD = 5 def serverStatusHome(request): proc = httpProc(request, 'serverStatus/index.html', diff --git a/version.txt b/version.txt index 010d8ea9e..219bd2b80 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -{"version":"2.3","build":1} \ No newline at end of file +{"version":"2.3","build":5} \ No newline at end of file