Skip to content

fix: Avoid hardcode binary path #197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deepin-bot merged 1 commit into from
Mar 17, 2026
Merged

fix: Avoid hardcode binary path #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions application/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2022 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2022 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-only

Expand Down Expand Up @@ -152,13 +152,13 @@ int main(int argc, char *argv[])
qDebug() << "deepin-diskmanager-service found, sending Quit signal.";
QString args = QString("--system --type=method_call --dest=com.deepin.diskmanager /com/deepin/diskmanager com.deepin.diskmanager.Quit");
QStringList argList = args.split(" ");
proc.startDetached("/usr/bin/dbus-send", argList);
proc.startDetached("dbus-send", argList);
}

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

//正常启动程序后,循环查询后台服务是否已经启动,如果后台服务启动说明鉴权成功,启动前端界面
while (1) {
Expand Down
6 changes: 3 additions & 3 deletions application/widgets/mainwindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2022 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2022 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-only

Expand Down Expand Up @@ -95,7 +95,7 @@ void MainWindow::closeEvent(QCloseEvent *event)
QProcess proc;
QString args = QString("--system --type=method_call --dest=com.deepin.diskmanager /com/deepin/diskmanager com.deepin.diskmanager.Quit");
QStringList argList = args.split(" ");
proc.startDetached("/usr/bin/dbus-send", argList);
proc.startDetached("dbus-send", argList);

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

}

Expand Down
4 changes: 2 additions & 2 deletions service/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2022 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2022 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-only

Expand All @@ -20,7 +20,7 @@ void checkFrontEndQuit(uint frontEndPid)
QString frontEndExe = QString("/proc/%1/exe").arg(frontEndPid);
QFileInfo info(frontEndExe);

if (info.symLinkTarget() != "/usr/bin/deepin-diskmanager") {
if (QFileInfo(info.symLinkTarget()).fileName() != "deepin-diskmanager") {
qWarning() << "Front-end process has quit";
QCoreApplication::exit(0);
}
Expand Down
Loading