From 9c2ad0a3f37c75582890d8611b8f7cc026809fc4 Mon Sep 17 00:00:00 2001
From: al_xipe <al_xipe@localhost>
Date: Sun, 29 Oct 2006 20:02:57 +0000
Subject: [PATCH] fix for issue 892 removed .sh extension in the bin directory and reflect the change in the test installer
---
opendj-sdk/opends/build.xml | 14 ++++++++++----
opendj-sdk/opends/tests/installer.xml | 6 +++---
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/opendj-sdk/opends/build.xml b/opendj-sdk/opends/build.xml
index 715a2ed..defe3ea 100644
--- a/opendj-sdk/opends/build.xml
+++ b/opendj-sdk/opends/build.xml
@@ -407,7 +407,11 @@
</copy>
<chmod file="${pdir}/*.sh" perm="755" />
- <chmod file="${pdir}/bin/*.sh" perm="755" />
+ <chmod perm="755">
+ <fileset dir="${pdir}/bin">
+ <exclude name="*.bat"/>
+ </fileset>
+ </chmod>
</target>
@@ -418,10 +422,12 @@
description="Package the Directory Server for distribution.">
<zip destfile="${package.dir}/OpenDS-${pkgversion}.zip">
- <zipfileset dir="${package.dir}" includes="**/*" excludes="**/*.sh"
+ <zipfileset dir="${package.dir}" includes="**/*"
filemode="644" dirmode="755" />
- <zipfileset dir="${package.dir}" includes="**/*.sh" filemode="755"
- dirmode="755" />
+ <zipfileset dir="${package.dir}"
+ includes="**/*.sh,**/backup,**/configure-ds,**/encode-password,**/export-ldif,**/import-ldif,**/ldapcompare,**/ldapdelete,**/ldapodify,**/ldappasswordmodify,**/ldapsearch,**/ldif-diff,**/ldifmodify,**/ldifsearch,**/makeldif,**/restore,**/start-ds,**/stop-ds,**/verify-index"
+ filemode="755"
+ dirmode="755" />
</zip>
</target>
diff --git a/opendj-sdk/opends/tests/installer.xml b/opendj-sdk/opends/tests/installer.xml
index a835583..ac3b914 100644
--- a/opendj-sdk/opends/tests/installer.xml
+++ b/opendj-sdk/opends/tests/installer.xml
@@ -77,7 +77,7 @@
</unzip>
<chmod perm="755">
<fileset dir="${full.install.dir}/bin">
- <include name="*.sh"/>
+ <exclude name="*.bat"/>
</fileset>
</chmod>
</target>
@@ -152,7 +152,7 @@
spawn="true" />
<exec
os="${unix.list}"
- executable="${full.install.dir}/bin/start-ds.sh"
+ executable="${full.install.dir}/bin/start-ds"
spawn="true" />
</target>
<target name="start">
@@ -182,7 +182,7 @@
</exec>
<exec
os="${unix.list}"
- executable="${full.install.dir}/bin/stop-ds.sh"
+ executable="${full.install.dir}/bin/stop-ds"
spawn="true" >
<arg line="-h ${host.name}"/>
<arg line="-p ${port.ldap}"/>
--
Gitblit v1.10.0