svn commit: r1036555 - /karaf/trunk/admin/core/src/main/java/org/apache/karaf/admin/internal/AdminServiceImpl.java

[gnodet]

Author: gnodet
Date: Thu Nov 18 17:41:05 2010
New Revision: 1036555

URL: http://svn.apache.org/viewvc?rev=1036555&view=rev
Log:
[KARAF-262] The command admin create new instance cannot create good script in 
bash language on cygwin

Modified:
    
karaf/trunk/admin/core/src/main/java/org/apache/karaf/admin/internal/AdminServiceImpl.java

Modified: 
karaf/trunk/admin/core/src/main/java/org/apache/karaf/admin/internal/AdminServiceImpl.java
URL: 
http://svn.apache.org/viewvc/karaf/trunk/admin/core/src/main/java/org/apache/karaf/admin/internal/AdminServiceImpl.java?rev=1036555&r1=1036554&r2=1036555&view=diff
==============================================================================
--- 
karaf/trunk/admin/core/src/main/java/org/apache/karaf/admin/internal/AdminServiceImpl.java
 (original)
+++ 
karaf/trunk/admin/core/src/main/java/org/apache/karaf/admin/internal/AdminServiceImpl.java
 Thu Nov 18 17:41:05 2010
@@ -169,7 +169,8 @@ public class AdminServiceImpl implements
         props.put("${SUBST-SSH-PORT}", Integer.toString(sshPort));
         copyFilteredResourceToDir(karafBase, "etc/system.properties", props);
         copyFilteredResourceToDir(karafBase, "etc/org.apache.karaf.shell.cfg", 
props);
-        if( System.getProperty("os.name").startsWith("Win") ) {
+        // If we use batch files, use batch files, else use bash scripts (even 
on cygwin)
+        if( new File( System.getProperty("karaf.home"), "bin/admin.bat" 
).exists() ) {
             copyFilteredResourceToDir(karafBase, "bin/karaf.bat", props);
             copyFilteredResourceToDir(karafBase, "bin/start.bat", props);
             copyFilteredResourceToDir(karafBase, "bin/stop.bat", props);