From 86e7e5b3b158a29f117c70b63cd19d182b578a22 Mon Sep 17 00:00:00 2001 From: arm64v8a <48624112+arm64v8a@users.noreply.github.com> Date: Tue, 2 May 2023 12:45:17 +0900 Subject: [PATCH] Remove unused --- res/{public => }/linux_pkexec.sh | 0 res/{public => }/linux_pkexec_root.sh | 0 sys/ExternalProcess.cpp | 7 ++----- sys/ExternalProcess.hpp | 1 - 4 files changed, 2 insertions(+), 6 deletions(-) rename res/{public => }/linux_pkexec.sh (100%) rename res/{public => }/linux_pkexec_root.sh (100%) diff --git a/res/public/linux_pkexec.sh b/res/linux_pkexec.sh similarity index 100% rename from res/public/linux_pkexec.sh rename to res/linux_pkexec.sh diff --git a/res/public/linux_pkexec_root.sh b/res/linux_pkexec_root.sh similarity index 100% rename from res/public/linux_pkexec_root.sh rename to res/linux_pkexec_root.sh diff --git a/sys/ExternalProcess.cpp b/sys/ExternalProcess.cpp index 0648664..e88929d 100644 --- a/sys/ExternalProcess.cpp +++ b/sys/ExternalProcess.cpp @@ -52,15 +52,12 @@ namespace NekoRay::sys { if (NekoRay::dataStore->flag_linux_run_core_as_admin && dynamic_cast(this)) { arguments.prepend(program); - arguments.prepend(QApplication::applicationDirPath() + "/linux_pkexec.sh"); - program = "bash"; + arguments.prepend("--keep-cwd"); + program = "pkexec"; } QProcess::setEnvironment(env); QProcess::start(program, arguments); - - // waitForStarted(); - // pid = processId(); } void ExternalProcess::Kill() { diff --git a/sys/ExternalProcess.hpp b/sys/ExternalProcess.hpp index 3da532f..90c701f 100644 --- a/sys/ExternalProcess.hpp +++ b/sys/ExternalProcess.hpp @@ -9,7 +9,6 @@ namespace NekoRay::sys { QString program; QStringList arguments; QStringList env; - qint64 pid = 0; bool managed = true; // MW_dialog_message