From a23264a54256e111a13e1067688bf4b9b314a413 Mon Sep 17 00:00:00 2001 From: dami Date: Thu, 7 May 2026 12:03:23 +0800 Subject: [PATCH] update --- plugins/supervisor/install.sh | 1 + web/utils/plugin.py | 11 ++++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/plugins/supervisor/install.sh b/plugins/supervisor/install.sh index a5fe72505..eeb4c66e3 100755 --- a/plugins/supervisor/install.sh +++ b/plugins/supervisor/install.sh @@ -13,6 +13,7 @@ VERSION=$2 # /www/server/mdserver-web/bin/supervisord -n -c /etc/supervisor/supervisord.conf # /www/server/mdserver-web/bin/supervisorctl -c /www/server/supervisor/supervisor.conf # cmd | status +# systemctl status supervisor # journalctl -u supervisor -f bash ${rootPath}/scripts/getos.sh diff --git a/web/utils/plugin.py b/web/utils/plugin.py index 32d858b3b..b6f8fa796 100644 --- a/web/utils/plugin.py +++ b/web/utils/plugin.py @@ -839,12 +839,17 @@ class plugin(object): if not os.path.exists(path): return ('', '') - py_cmd = 'cd ' + mw.getPanelDir() + " && "+ py_cmd - data = mw.execShell(py_cmd) + + source_bin_activate = mw.getPanelDir() + "/bin/activate" + py_cmd_dir = 'cd ' + mw.getPanelDir() + if os.path.exists(source_bin_activate): + py_cmd_dir += " source "+source_bin_activate + do_cmd = py_cmd_dir + " && "+ py_cmd + data = mw.execShell(do_cmd) # print(data) if mw.isDebugMode(): - print('run:', py_cmd) + print('run:', do_cmd) print(data) # print os.path.exists(py_cmd) return (data[0].strip(), data[1].strip())