You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
34 lines
1.1 KiB
34 lines
1.1 KiB
commit e131f10b84dbec07ad49d36c192777a72189a39e
|
|
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
|
|
Date: 1329026747 -0600
|
|
|
|
Fix tdesu internal pathing
|
|
This closes Bug 766
|
|
|
|
diff --git a/tdesu/stub.cpp b/tdesu/stub.cpp
|
|
index 7f083d7..5b222f5 100644
|
|
--- a/kdesu/stub.cpp
|
|
+++ b/kdesu/stub.cpp
|
|
@@ -121,11 +121,16 @@ int StubProcess::ConverseStub(int check)
|
|
TQCString path = getenv("PATH");
|
|
if (!path.isEmpty() && path[0] == ':')
|
|
path = path.mid(1);
|
|
- if (m_User == "root")
|
|
- if (!path.isEmpty())
|
|
- path = "/sbin:/bin:/usr/sbin:/usr/bin:" + path;
|
|
- else
|
|
- path = "/sbin:/bin:/usr/sbin:/usr/bin";
|
|
+ if (m_User == "root")
|
|
+ if (!path.isEmpty())
|
|
+ path = "/usr/local/sbin:/usr/sbin:/sbin:" + path;
|
|
+ else
|
|
+ if (strcmp(__KDE_BINDIR, "/usr/bin") == 0) {
|
|
+ path = "/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin";
|
|
+ }
|
|
+ else {
|
|
+ path = "/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:" __KDE_BINDIR ":/usr/bin:/bin";
|
|
+ }
|
|
writeLine(path);
|
|
} else if (line == "user") {
|
|
writeLine(m_User);
|