From eaa6a6f17df404995b40ae6c4caebfd7947be7bb Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Thu, 26 Apr 2007 14:43:23 +0000
Subject: [PATCH] Complete fix for 1252 restrict installed bin files to relevant platform.
---
opends/src/server/org/opends/server/util/SetupUtils.java | 15 ++++-----------
1 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/opends/src/server/org/opends/server/util/SetupUtils.java b/opends/src/server/org/opends/server/util/SetupUtils.java
index 43c67de..45b6e79 100644
--- a/opends/src/server/org/opends/server/util/SetupUtils.java
+++ b/opends/src/server/org/opends/server/util/SetupUtils.java
@@ -203,19 +203,12 @@
}
- File binDirectory;
- if (isWindows())
- {
- binDirectory = new File(serverRoot, "bat");
- }
- else
- {
- binDirectory = new File(serverRoot, "bin");
- }
+ File libDirectory = new File(serverRoot, "lib");
+
File setJavaHomeFile;
if (isWindows())
{
- setJavaHomeFile = new File(binDirectory, "set-java-home.bat");
+ setJavaHomeFile = new File(libDirectory, "set-java-home.bat");
if (setJavaHomeFile.exists())
{
return setJavaHomeFile;
@@ -229,7 +222,7 @@
}
else
{
- setJavaHomeFile = new File(binDirectory, "set-java-home");
+ setJavaHomeFile = new File(libDirectory, "set-java-home");
if (setJavaHomeFile.exists())
{
return setJavaHomeFile;
--
Gitblit v1.10.0