From a78a557d5a1d5197d0567f915d69c842b1081019 Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Mon, 9 Mar 2020 16:31:48 +0500 Subject: [PATCH 1/4] update MarkupSafe version --- requirments.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirments.txt b/requirments.txt index 4b1b8bc45..b9a4b0222 100755 --- a/requirments.txt +++ b/requirments.txt @@ -29,7 +29,7 @@ jmespath==0.9.3 josepy==1.1.0 jsonpatch==1.2 jsonpointer==1.9 -MarkupSafe==0.11 +MarkupSafe==0.19 mock==2.0.0 mysqlclient==1.4.6 paramiko==2.6.0 From 2dbe7bece7b92c1ba659e6b459c19a775c2ada04 Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Fri, 27 Mar 2020 11:07:00 +0500 Subject: [PATCH 2/4] bug fix: phpmyadmin --- install/install.py | 2 +- plogical/test.py | 12 ++++++++++++ plogical/upgrade.py | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/install/install.py b/install/install.py index ed9ff15b2..8e9bdb9d4 100755 --- a/install/install.py +++ b/install/install.py @@ -706,7 +706,7 @@ class preFlightsChecks: preFlightsChecks.call(command, self.distro, '[download_install_phpmyadmin]', command, 1, 0, os.EX_OSERR) - command = 'mv /usr/local/CyberCP/public/phpMyAdmin-5.0.0-all-languages /usr/local/CyberCP/public/phpmyadmin' + command = 'mv /usr/local/CyberCP/public/phpMyAdmin-*-all-languages /usr/local/CyberCP/public/phpmyadmin' preFlightsChecks.call(command, self.distro, '[download_install_phpmyadmin]', command, 1, 0, os.EX_OSERR) diff --git a/plogical/test.py b/plogical/test.py index e69de29bb..efa8b89fb 100755 --- a/plogical/test.py +++ b/plogical/test.py @@ -0,0 +1,12 @@ +import subprocess +import json + +command = 'postqueue -j' + +result = subprocess.check_output(command, shell=True).decode().split('\n') + +result = result[0] + +data = json.loads(result) + +print(data['queue_name']) \ No newline at end of file diff --git a/plogical/upgrade.py b/plogical/upgrade.py index c925a0878..f60d57d89 100755 --- a/plogical/upgrade.py +++ b/plogical/upgrade.py @@ -202,7 +202,7 @@ class Upgrade: command = 'unzip /usr/local/CyberCP/public/phpmyadmin.zip -d /usr/local/CyberCP/public/' Upgrade.executioner(command, 0) - command = 'mv /usr/local/CyberCP/public/phpMyAdmin-5.0.0-all-languages /usr/local/CyberCP/public/phpmyadmin' + command = 'mv /usr/local/CyberCP/public/phpMyAdmin-*-all-languages /usr/local/CyberCP/public/phpmyadmin' Upgrade.executioner(command, 0) command = 'rm -f /usr/local/CyberCP/public/phpmyadmin.zip' From d9b8ea7e8d76bc1f04a787cb383e635778754e88 Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Fri, 27 Mar 2020 11:26:37 +0500 Subject: [PATCH 3/4] bug fix: phpmyadmin --- plogical/test.py | 12 ------------ plogical/upgrade.py | 2 +- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/plogical/test.py b/plogical/test.py index efa8b89fb..e69de29bb 100755 --- a/plogical/test.py +++ b/plogical/test.py @@ -1,12 +0,0 @@ -import subprocess -import json - -command = 'postqueue -j' - -result = subprocess.check_output(command, shell=True).decode().split('\n') - -result = result[0] - -data = json.loads(result) - -print(data['queue_name']) \ No newline at end of file diff --git a/plogical/upgrade.py b/plogical/upgrade.py index f60d57d89..1b25e8139 100755 --- a/plogical/upgrade.py +++ b/plogical/upgrade.py @@ -203,7 +203,7 @@ class Upgrade: Upgrade.executioner(command, 0) command = 'mv /usr/local/CyberCP/public/phpMyAdmin-*-all-languages /usr/local/CyberCP/public/phpmyadmin' - Upgrade.executioner(command, 0) + subprocess.call(command, shell=True) command = 'rm -f /usr/local/CyberCP/public/phpmyadmin.zip' Upgrade.executioner(command, 0) From baef101697b0862a9f4d9a92c2432739eb2f48f0 Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Fri, 27 Mar 2020 11:29:58 +0500 Subject: [PATCH 4/4] bug fix: phpmyadmin --- install/install.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/install/install.py b/install/install.py index 8e9bdb9d4..d944f12ed 100755 --- a/install/install.py +++ b/install/install.py @@ -707,8 +707,7 @@ class preFlightsChecks: command, 1, 0, os.EX_OSERR) command = 'mv /usr/local/CyberCP/public/phpMyAdmin-*-all-languages /usr/local/CyberCP/public/phpmyadmin' - preFlightsChecks.call(command, self.distro, '[download_install_phpmyadmin]', - command, 1, 0, os.EX_OSERR) + subprocess.call(command, shell=True) command = 'rm -f /usr/local/CyberCP/public/phpmyadmin.zip' preFlightsChecks.call(command, self.distro, '[download_install_phpmyadmin]',