From 170bf9ef7250618cc02ca153d83fe4fb4855833a Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Fri, 17 Nov 2006 21:21:23 +0000
Subject: [PATCH] Rename the "setup.sh" script to "setup" and update all references to it to use the correct name.
---
opends/src/server/org/opends/server/tools/InstallDS.java | 2 +-
opends/build.xml | 8 ++++----
opends/src/quicksetup/org/opends/quicksetup/SetupLauncher.java | 2 +-
opends/resource/setup | 2 +-
opends/resource/README | 6 +++---
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/opends/build.xml b/opends/build.xml
index cd6c248..7ddff9b 100644
--- a/opends/build.xml
+++ b/opends/build.xml
@@ -470,12 +470,12 @@
<fileset file="${resource.dir}/README" />
</copy>
- <fixcrlf srcDir="${resource.dir}" destDir="${pdir}" includes="setup.sh"
+ <fixcrlf srcDir="${resource.dir}" destDir="${pdir}" includes="setup"
eol="lf" />
<fixcrlf srcDir="${resource.dir}" destDir="${pdir}" includes="setup.bat"
eol="crlf" />
- <chmod file="${pdir}/*.sh" perm="755" />
+ <chmod file="${pdir}/setup" perm="755" />
<chmod perm="755">
<fileset dir="${pdir}/bin">
<exclude name="*.bat"/>
@@ -492,7 +492,7 @@
<zip destfile="${package.dir}/OpenDS-${pkgversion}.zip">
<zipfileset dir="${package.dir}" includes="**/*"
- excludes="OpenDS-${pkgversion}/bin/*,OpenDS-${pkgversion}/setup.sh"
+ excludes="OpenDS-${pkgversion}/bin/*,OpenDS-${pkgversion}/setup"
filemode="644" dirmode="755" />
<zipfileset dir="${package.dir}"
includes="OpenDS-${pkgversion}/bin/*.bat"
@@ -500,7 +500,7 @@
<zipfileset dir="${package.dir}" includes="OpenDS-${pkgversion}/bin/*"
excludes="OpenDS-${pkgversion}/bin/*.bat"
filemode="755" dirmode="755" />
- <zipfileset dir="${package.dir}" includes="OpenDS-${pkgversion}/setup.sh"
+ <zipfileset dir="${package.dir}" includes="OpenDS-${pkgversion}/setup"
filemode="755" dirmode="755" />
</zip>
</target>
diff --git a/opends/resource/README b/opends/resource/README
index 22bb8eb..e8b86dc 100644
--- a/opends/resource/README
+++ b/opends/resource/README
@@ -3,9 +3,9 @@
This archive contains the OpenDS Directory Server. Complete documentation for
this product may be found online at https://OpenDS.dev.java.net/.
-To configure the server, run the setup.sh script on UNIX-based platforms, or
-the setup.bat batch file on Windows. To start the server, run bin/start-ds.sh
-on UNIX-based platforms, or bin\start-ds.bat on Windows systems.
+To configure the server, run the setup script on UNIX-based platforms, or the
+setup.bat batch file on Windows. To start the server, run bin/start-ds.sh on
+UNIX-based platforms, or bin\start-ds.bat on Windows systems.
This product is made available under the Common Development and Distribution
License (CDDL). The complete text for this license, and for alternate licenses
diff --git a/opends/resource/setup.sh b/opends/resource/setup
similarity index 97%
rename from opends/resource/setup.sh
rename to opends/resource/setup
index 9ddac4c..cfc8f56 100755
--- a/opends/resource/setup.sh
+++ b/opends/resource/setup
@@ -111,5 +111,5 @@
# Launch the setup process.
-"${JAVA_BIN}" org.opends.quicksetup.SetupLauncher -P setup.sh "${@}"
+"${JAVA_BIN}" org.opends.quicksetup.SetupLauncher -P setup "${@}"
diff --git a/opends/src/quicksetup/org/opends/quicksetup/SetupLauncher.java b/opends/src/quicksetup/org/opends/quicksetup/SetupLauncher.java
index 8c61e6d..dbc2d44 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/SetupLauncher.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/SetupLauncher.java
@@ -45,7 +45,7 @@
{
private static String COMMAND_NAME_WINDOWS = "setup.bat";
- private static String COMMAND_NAME_UNIX = "setup.sh";
+ private static String COMMAND_NAME_UNIX = "setup";
/**
* The main method which is called by the setup command lines.
diff --git a/opends/src/server/org/opends/server/tools/InstallDS.java b/opends/src/server/org/opends/server/tools/InstallDS.java
index 54b351c..a473c96 100644
--- a/opends/src/server/org/opends/server/tools/InstallDS.java
+++ b/opends/src/server/org/opends/server/tools/InstallDS.java
@@ -143,7 +143,7 @@
}
else
{
- programName = "setup.sh";
+ programName = "setup";
}
--
Gitblit v1.10.0