From 2dbe7bece7b92c1ba659e6b459c19a775c2ada04 Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Fri, 27 Mar 2020 11:07:00 +0500 Subject: [PATCH] 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'