Applications
/
ublexec
9
0
Fork 2
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

command building edits

Browse Source
pull/51/head
Ivan Dmitrievich Yartsev 2 years ago
parent 00a5ff58bb
commit f6940d2e17
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File

10
source/ublexec.cc
Unescape View File

@ -637,18 +637,20 @@ string MainWindow::start_cmd(string user_cmd) {
if (cbxExecuteEpriority->get_active()) { if (cbxExecuteEpriority->get_active()) {
str_variants_root += " nice -n " + to_string(spinPriority->get_value_as_int()); str_variants_root += " nice -n " + to_string(spinPriority->get_value_as_int());
} }
if (cmbUser->get_active_text()=="root")
str_variants_root += " env HOME=$HOME DISPLAY=$DISPLAY WAYLAND_DISPLAY=$WAYLAND_DISPLAY XAUTHORITY=$XAUTHORITY DBUS_SESSION_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS XDG_SESSION_TYPE=$XDG_SESSION_TYPE XDG_RUNTIME_DIR=$XDG_RUNTIME_DIR SESSION_MANAGER=$SESSION_MANAGER GNOME_DESKTOP_SESSION_ID=$GNOME_DESKTOP_SESSION_ID KDE_FULL_SESSION=$KDE_FULL_SESSION "; str_variants_root += " env HOME=$HOME DISPLAY=$DISPLAY WAYLAND_DISPLAY=$WAYLAND_DISPLAY XAUTHORITY=$XAUTHORITY DBUS_SESSION_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS XDG_SESSION_TYPE=$XDG_SESSION_TYPE XDG_RUNTIME_DIR=$XDG_RUNTIME_DIR SESSION_MANAGER=$SESSION_MANAGER GNOME_DESKTOP_SESSION_ID=$GNOME_DESKTOP_SESSION_ID KDE_FULL_SESSION=$KDE_FULL_SESSION ";
else
str_variants_root += " env HOME=$HOME DISPLAY=$DISPLAY WAYLAND_DISPLAY=$WAYLAND_DISPLAY XAUTHORITY=$XAUTHORITY DBUS_SESSION_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS XDG_SESSION_TYPE=$XDG_SESSION_TYPE ";
} }
else if (rbSu->get_active()) { else if (rbSu->get_active()) {
chbTerminal->set_active(true); chbTerminal->set_active(true);
string str_user = cmbUser->get_active_text(); string str_user = cmbUser->get_active_text();
if (str_user != "root") { if (str_user != "root") {
str_variants_root = "su -l " + cmbUser->get_active_text(); str_variants_root = "su --preserve-environment --login " + cmbUser->get_active_text() + " --command \"";
} }
else{ else{
str_variants_root = "su "; str_variants_root = "su --preserve-environment --command \"";
} }
str_variants_root += " -c \" DISPLAY=$DISPLAY ";
if (cbxExecuteEpriority->get_active()) { if (cbxExecuteEpriority->get_active()) {
str_variants_root += "nice -n " + to_string(spinPriority->get_value_as_int()) + " "; str_variants_root += "nice -n " + to_string(spinPriority->get_value_as_int()) + " ";
} }
@ -656,7 +658,7 @@ string MainWindow::start_cmd(string user_cmd) {
else if (rbSudo->get_active()) { else if (rbSudo->get_active()) {
chbTerminal->set_active(true); chbTerminal->set_active(true);
if (user_exec_app==cmbUser->get_active_text()) { if (user_exec_app==cmbUser->get_active_text()) {
str_variants_root = "sudo "; str_variants_root = "sudo --preserve-env setsid ";
} }
else{ else{
str_variants_root = "sudo -u " + cmbUser->get_active_text() + " "; str_variants_root = "sudo -u " + cmbUser->get_active_text() + " ";

Write Preview
Loading…
Cancel
Save