Author: gnodet Date: Wed Nov 17 22:16:14 2010 New Revision: 1036254 URL: http://svn.apache.org/viewvc?rev=1036254&view=rev Log: [KARAF-262] The command admin create new instance cannot create good script in bash language on cygwin
Modified: karaf/branches/karaf-2.1.x/admin/core/src/main/java/org/apache/karaf/admin/internal/AdminServiceImpl.java Modified: karaf/branches/karaf-2.1.x/admin/core/src/main/java/org/apache/karaf/admin/internal/AdminServiceImpl.java URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.1.x/admin/core/src/main/java/org/apache/karaf/admin/internal/AdminServiceImpl.java?rev=1036254&r1=1036253&r2=1036254&view=diff ============================================================================== --- karaf/branches/karaf-2.1.x/admin/core/src/main/java/org/apache/karaf/admin/internal/AdminServiceImpl.java (original) +++ karaf/branches/karaf-2.1.x/admin/core/src/main/java/org/apache/karaf/admin/internal/AdminServiceImpl.java Wed Nov 17 22:16:14 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);