Optimize permission for linux

This commit is contained in:
arm64v8a
2023-05-02 11:58:33 +09:00
parent 50387db15e
commit 3d2ce33a75
10 changed files with 73 additions and 11 deletions

View File

@@ -19,7 +19,7 @@ namespace NekoRay::sys {
if (started) return;
started = true;
if (show_log) {
if (managed) {
connect(this, &QProcess::readyReadStandardOutput, this, [&]() {
MW_show_log_ext_vt100(readAllStandardOutput().trimmed());
});
@@ -30,7 +30,7 @@ namespace NekoRay::sys {
if (!killed) {
crashed = true;
MW_show_log_ext(tag, "errorOccurred:" + errorString());
if (managed) MW_dialog_message("ExternalProcess", "Crashed");
MW_dialog_message("ExternalProcess", "Crashed");
}
});
connect(this, &QProcess::stateChanged, this, [&](QProcess::ProcessState state) {
@@ -41,15 +41,26 @@ namespace NekoRay::sys {
crashed = true;
MW_show_log_ext(tag, "[Error] Program exited accidentally: " + errorString());
Kill();
if (managed) MW_dialog_message("ExternalProcess", "Crashed");
MW_dialog_message("ExternalProcess", "Crashed");
}
}
});
MW_show_log_ext(tag, "[Starting] " + env.join(" ") + " " + program + " " + arguments.join(" "));
}
QProcess::setEnvironment(env);
if (NekoRay::dataStore->flag_linux_run_core_as_admin && dynamic_cast<CoreProcess *>(this)) {
arguments.prepend(program);
arguments.prepend(QApplication::applicationDirPath() + "/linux_pkexec.sh");
program = "bash";
}
QProcess::setEnvironment(env);
QProcess::start(program, arguments);
// waitForStarted();
// pid = processId();
}
void ExternalProcess::Kill() {
@@ -64,7 +75,6 @@ namespace NekoRay::sys {
CoreProcess::CoreProcess(const QString &core_path, const QStringList &args) : ExternalProcess() {
ExternalProcess::managed = false;
ExternalProcess::show_log = false;
ExternalProcess::program = core_path;
ExternalProcess::arguments = args;