From c0e776c195406d5bd83fdd683ac73c56fcc8a93f Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Mon, 26 Feb 2007 21:13:28 +0000
Subject: [PATCH] Centralize the hardcoded strings of the different commands used in the setup and in the control panel in the class Utils.java.
---
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/InstallLauncher.java | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/InstallLauncher.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/InstallLauncher.java
index d4be8d6..4cd4ecc 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/InstallLauncher.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/InstallLauncher.java
@@ -43,10 +43,6 @@
*/
public class InstallLauncher
{
- private static String COMMAND_NAME_WINDOWS = "setup.bat";
-
- private static String COMMAND_NAME_UNIX = "setup";
-
/**
* The main method which is called by the setup command lines.
* @param args the arguments passed by the command lines. In the case
@@ -93,10 +89,10 @@
String arg;
if (Utils.isWindows())
{
- arg = COMMAND_NAME_WINDOWS;
+ arg = Utils.getWindowsSetupFileName();
} else
{
- arg = COMMAND_NAME_UNIX;
+ arg = Utils.getUnixSetupFileName();
}
/*
* This is required because the usage message contains '{' characters that
@@ -142,11 +138,11 @@
if (Utils.isWindows())
{
System.setProperty("org.opends.server.scriptName",
- COMMAND_NAME_WINDOWS);
+ Utils.getWindowsSetupFileName());
} else
{
System.setProperty("org.opends.server.scriptName",
- COMMAND_NAME_UNIX);
+ Utils.getUnixSetupFileName());
}
ArrayList<String> newArgList = new ArrayList<String>();
if (args != null)
--
Gitblit v1.10.0