Skip to content

Fixed error in status file writing via notify-send after TEMP_DIR deletion. #496

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

Open
phoepsilonix wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed error in status file writing via notify-send after TEMP_DIR deletion. #496

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
73 changes: 68 additions & 5 deletions src/Utility/TeeJee.Process.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,12 @@ namespace TeeJee.ProcessHelper{

try {

string scriptfile = save_bash_script_temp (script);
string? scriptfile = save_bash_script_temp (script);

if (scriptfile == null) {
log_error("Failed to create temporary script");
return 1;
}

string[] argv = new string[1];
argv[0] = scriptfile;
Expand Down Expand Up @@ -209,17 +214,75 @@ namespace TeeJee.ProcessHelper{
public static int exec_user_async(string command) {
// find correct user
int uid = TeeJee.System.get_user_id();
string cmd = command;
string[] args;

if(uid > 0) {
// non root
string? user = TeeJee.System.get_username_from_uid(uid);
if(user != null) {
cmd = "pkexec --user %s env DISPLAY=$DISPLAY XAUTHORITY=$XAUTHORITY DBUS_SESSION_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS ".printf(user) + cmd;
args = new string[] {
"pkexec",
"--user", user,
"env",
"DISPLAY=" + Environment.get_variable("DISPLAY"),
"XAUTHORITY=" + Environment.get_variable("XAUTHORITY"),
"DBUS_SESSION_BUS_ADDRESS=" + Environment.get_variable("DBUS_SESSION_BUS_ADDRESS")
};

try {
string[] cmd_parts;
Shell.parse_argv(command, out cmd_parts);
foreach (string part in cmd_parts) {
args += part;
}
} catch (ShellError e) {
log_error("Failed to parse command: " + e.message);
return 1;
}
} else {
try {
Shell.parse_argv(command, out args);
} catch (ShellError e) {
log_error("Failed to parse command: " + e.message);
return 1;
}
}
} else {
try {
Shell.parse_argv(command, out args);
} catch (ShellError e) {
log_error("Failed to parse command: " + e.message);
return 1;
}
}

log_debug(cmd);
return TeeJee.ProcessHelper.exec_script_async(cmd);
log_debug(string.joinv(" ", args));
return TeeJee.ProcessHelper.exec_async_with_args(args);
}

public int exec_async_with_args(string[] argv) {
/**
* Executes commands asynchronously with proper argument array.
*/

try {
string[] env = Environ.get();
Pid child_pid;

Process.spawn_async_with_pipes(
TEMP_DIR, //working dir
argv, //argv (properly parsed)
env, //environment
SpawnFlags.SEARCH_PATH,
null,
out child_pid);

return 0;
}
catch (Error e){
log_error (e.message);
return 1;
}
}

public string? save_bash_script_temp (string commands, string? script_path = null,
Expand Down