From 6ef551397ad3f015890e95297485b60b66aa46bf Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Wed, 17 Aug 2011 21:14:27 +0000
Subject: [PATCH] change: let Mac Ports and Fink paths on Mac OS X take
precedence over the standard paths (mimic behavior on shell)
SVN: 22549
---
.../cisd/base/utilities/OSUtilities.java | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/base/source/java/ch/systemsx/cisd/base/utilities/OSUtilities.java b/base/source/java/ch/systemsx/cisd/base/utilities/OSUtilities.java
index 4eba9fb8d76..4aba90d8b96 100644
--- a/base/source/java/ch/systemsx/cisd/base/utilities/OSUtilities.java
+++ b/base/source/java/ch/systemsx/cisd/base/utilities/OSUtilities.java
@@ -145,15 +145,6 @@ public class OSUtilities
final Set<String> pathEntries = getOSPath();
if (isUnix())
{
- pathEntries.add("/usr/local/bin");
- pathEntries.add("/usr/bin");
- pathEntries.add("/bin");
- if (root)
- {
- pathEntries.add("/usr/local/sbin");
- pathEntries.add("/usr/sbin");
- pathEntries.add("/sbin");
- }
if (isMacOS())
{
pathEntries.add("/opt/local/bin"); // MacPorts
@@ -164,6 +155,15 @@ public class OSUtilities
pathEntries.add("/sw/sbin");
}
}
+ pathEntries.add("/usr/local/bin");
+ pathEntries.add("/usr/bin");
+ pathEntries.add("/bin");
+ if (root)
+ {
+ pathEntries.add("/usr/local/sbin");
+ pathEntries.add("/usr/sbin");
+ pathEntries.add("/sbin");
+ }
}
return pathEntries;
}
--
GitLab