From 9eec58596c66401cad41c73cafcced944289561b Mon Sep 17 00:00:00 2001 From: Wang Zichong Date: Sat, 27 Aug 2022 16:25:52 +0800 Subject: [PATCH] fix: avoid hardcode binary path MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 避免硬编码可执行文件的路径,提高可移植性 Log: --- application/main.cpp | 7 +++++-- application/widgets/mainwindow.cpp | 11 ++++++++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/application/main.cpp b/application/main.cpp index bd5afb16..e551d49f 100644 --- a/application/main.cpp +++ b/application/main.cpp @@ -121,10 +121,13 @@ int main(int argc, char *argv[]) cmd = QString("pidof deepin-diskmanager-service"); if (!executCmd(cmd, outPut, error)) { - proc.startDetached("/usr/bin/dbus-send --system --type=method_call --dest=com.deepin.diskmanager /com/deepin/diskmanager com.deepin.diskmanager.Quit"); + proc.startDetached("dbus-send", { + "--system", "--type=method_call", "--dest=com.deepin.diskmanager", + "/com/deepin/diskmanager", "com.deepin.diskmanager.Quit" + }); } - proc.startDetached("/usr/bin/deepin-diskmanager-authenticateProxy"); + proc.startDetached("deepin-diskmanager-authenticateProxy", {}); //正常启动程序后,循环查询后台服务是否已经启动,如果后台服务启动说明鉴权成功,启动前端界面 while (1) { diff --git a/application/widgets/mainwindow.cpp b/application/widgets/mainwindow.cpp index 56a2e95e..28a1213b 100644 --- a/application/widgets/mainwindow.cpp +++ b/application/widgets/mainwindow.cpp @@ -99,7 +99,10 @@ void MainWindow::closeEvent(QCloseEvent *event) m_central->HandleQuit(); // m_handler->Quit(); QProcess proc; - proc.startDetached("/usr/bin/dbus-send --system --type=method_call --dest=com.deepin.diskmanager /com/deepin/diskmanager com.deepin.diskmanager.Quit"); + proc.startDetached("dbus-send", { + "--system", "--type=method_call", "--dest=com.deepin.diskmanager", + "/com/deepin/diskmanager", "com.deepin.diskmanager.Quit" + }); DMainWindow::closeEvent(event); } @@ -151,8 +154,10 @@ void MainWindow::onHandleQuitAction() qDebug() << __FUNCTION__; QProcess proc; - proc.startDetached("/usr/bin/dbus-send --system --type=method_call --dest=com.deepin.diskmanager /com/deepin/diskmanager com.deepin.diskmanager.Quit"); - + proc.startDetached("dbus-send", { + "--system", "--type=method_call", "--dest=com.deepin.diskmanager", + "/com/deepin/diskmanager", "com.deepin.diskmanager.Quit" + }); } QString MainWindow::getRootLoginResult()