Skip to content

Commit d8719ea

Browse files
committed
fix: Avoid hardcode binary path
Avoid hardcoding executable file paths to improve portability. Bug: linuxdeepin/developer-center#3374
1 parent 59df3aa commit d8719ea

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

application/main.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,13 +152,13 @@ int main(int argc, char *argv[])
152152
qDebug() << "deepin-diskmanager-service found, sending Quit signal.";
153153
QString args = QString("--system --type=method_call --dest=com.deepin.diskmanager /com/deepin/diskmanager com.deepin.diskmanager.Quit");
154154
QStringList argList = args.split(" ");
155-
proc.startDetached("/usr/bin/dbus-send", argList);
155+
proc.startDetached("dbus-send", argList);
156156
}
157157

158158
QStringList argList;
159159
argList << QString::number(QCoreApplication::applicationPid()) << QDBusConnection::systemBus().baseService();
160160
qDebug() << "Starting deepin-diskmanager-authenticateProxy with args:" << argList;
161-
proc.startDetached("/usr/bin/deepin-diskmanager-authenticateProxy", argList);
161+
proc.startDetached("deepin-diskmanager-authenticateProxy", argList);
162162

163163
//正常启动程序后,循环查询后台服务是否已经启动,如果后台服务启动说明鉴权成功,启动前端界面
164164
while (1) {

application/widgets/mainwindow.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ void MainWindow::closeEvent(QCloseEvent *event)
9595
QProcess proc;
9696
QString args = QString("--system --type=method_call --dest=com.deepin.diskmanager /com/deepin/diskmanager com.deepin.diskmanager.Quit");
9797
QStringList argList = args.split(" ");
98-
proc.startDetached("/usr/bin/dbus-send", argList);
98+
proc.startDetached("dbus-send", argList);
9999

100100
DMainWindow::closeEvent(event);
101101
qDebug() << "MainWindow::closeEvent completed.";
@@ -176,7 +176,7 @@ void MainWindow::onHandleQuitAction()
176176
QProcess proc;
177177
QString args = QString("--system --type=method_call --dest=com.deepin.diskmanager /com/deepin/diskmanager com.deepin.diskmanager.Quit");
178178
QStringList argList = args.split(" ");
179-
proc.startDetached("/usr/bin/dbus-send", argList);
179+
proc.startDetached("dbus-send", argList);
180180

181181
}
182182

service/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ void checkFrontEndQuit(uint frontEndPid)
2020
QString frontEndExe = QString("/proc/%1/exe").arg(frontEndPid);
2121
QFileInfo info(frontEndExe);
2222

23-
if (info.symLinkTarget() != "/usr/bin/deepin-diskmanager") {
23+
if (QFileInfo(info.symLinkTarget()).fileName() != "deepin-diskmanager") {
2424
qWarning() << "Front-end process has quit";
2525
QCoreApplication::exit(0);
2626
}

0 commit comments

Comments
 (0)