diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-10-15 20:20:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-15 20:20:34 +0200 |
| commit | a851546845f0078ada3f8b7f6ee2e8f189c7f85a (patch) | |
| tree | f8f7506a3444400c771e2f34f10e4ddc15e00a80 /platform/x11/os_x11.cpp | |
| parent | 5cf925c64de82e261c93c71626db6598d00140b2 (diff) | |
| parent | b1252caa10b9016547e1a99f546254fa61b335b9 (diff) | |
Merge pull request #12074 from J08nY/fix/use-bin-name
Use binary names instead of absolute paths in calls to OS::execute.
Diffstat (limited to 'platform/x11/os_x11.cpp')
| -rw-r--r-- | platform/x11/os_x11.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp index e389c6932e..bc18d0c1f0 100644 --- a/platform/x11/os_x11.cpp +++ b/platform/x11/os_x11.cpp @@ -1939,7 +1939,7 @@ Error OS_X11::shell_open(String p_uri) { Error ok; List<String> args; args.push_back(p_uri); - ok = execute("/usr/bin/xdg-open", args, false); + ok = execute("xdg-open", args, false); if (ok == OK) return OK; ok = execute("gnome-open", args, false); @@ -2003,7 +2003,7 @@ String OS_X11::get_system_dir(SystemDir p_dir) const { String pipe; List<String> arg; arg.push_back(xdgparam); - Error err = const_cast<OS_X11 *>(this)->execute("/usr/bin/xdg-user-dir", arg, true, NULL, &pipe); + Error err = const_cast<OS_X11 *>(this)->execute("xdg-user-dir", arg, true, NULL, &pipe); if (err != OK) return "."; return pipe.strip_edges(); @@ -2053,7 +2053,7 @@ void OS_X11::alert(const String &p_alert, const String &p_title) { args.push_back(p_title); args.push_back(p_alert); - execute("/usr/bin/xmessage", args, true); + execute("xmessage", args, true); } void OS_X11::set_icon(const Ref<Image> &p_icon) { @@ -2236,12 +2236,12 @@ Error OS_X11::move_to_trash(const String &p_path) { List<String> args; args.push_back("-p"); args.push_back(trashcan); - Error err = execute("/bin/mkdir", args, true); + Error err = execute("mkdir", args, true); if (err == OK) { List<String> args2; args2.push_back(p_path); args2.push_back(trashcan); - err = execute("/bin/mv", args2, true); + err = execute("mv", args2, true); } return err; |