You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ja...@apache.org on 2014/01/14 20:42:40 UTC
git commit: Copy both linux and win shell scripts when creating an
instance
Updated Branches:
refs/heads/master 52cae1609 -> c329137b5
Copy both linux and win shell scripts when creating an instance
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/c329137b
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/c329137b
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/c329137b
Branch: refs/heads/master
Commit: c329137b5f153be36da3e9f3376e8334f824066c
Parents: 52cae16
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Tue Jan 14 16:11:39 2014 -0330
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Tue Jan 14 16:11:39 2014 -0330
----------------------------------------------------------------------
.../core/internal/InstanceServiceImpl.java | 31 ++++++++++----------
1 file changed, 15 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/c329137b/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java
----------------------------------------------------------------------
diff --git a/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java b/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java
index ba99b75..c232e34 100644
--- a/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java
+++ b/instance/core/src/main/java/org/apache/karaf/instance/core/internal/InstanceServiceImpl.java
@@ -321,22 +321,21 @@ public class InstanceServiceImpl implements InstanceService {
copyFilteredResourceToDir(karafBase, "etc/system.properties", props, printOutput);
copyFilteredResourceToDir(karafBase, "etc/org.apache.karaf.shell.cfg", props, printOutput);
copyFilteredResourceToDir(karafBase, "etc/org.apache.karaf.management.cfg", props, printOutput);
- // If we use batch files, use batch files, else use bash scripts (even on cygwin)
- boolean windows = System.getProperty("os.name").startsWith("Win");
- boolean cygwin = windows && new File(System.getProperty("karaf.home"), "bin/admin").exists();
- if (windows && !cygwin) {
- copyFilteredResourceToDir(karafBase, "bin/karaf.bat", props, printOutput);
- copyFilteredResourceToDir(karafBase, "bin/start.bat", props, printOutput);
- copyFilteredResourceToDir(karafBase, "bin/stop.bat", props, printOutput);
- } else {
- copyFilteredResourceToDir(karafBase, "bin/karaf", props, printOutput);
- copyFilteredResourceToDir(karafBase, "bin/start", props, printOutput);
- copyFilteredResourceToDir(karafBase, "bin/stop", props, printOutput);
- if (!cygwin) {
- chmod(new File(karafBase, "bin/karaf"), "a+x");
- chmod(new File(karafBase, "bin/start"), "a+x");
- chmod(new File(karafBase, "bin/stop"), "a+x");
- }
+
+ copyFilteredResourceToDir(karafBase, "bin/karaf", props, printOutput);
+ copyFilteredResourceToDir(karafBase, "bin/start", props, printOutput);
+ copyFilteredResourceToDir(karafBase, "bin/stop", props, printOutput);
+
+ copyFilteredResourceToDir(karafBase, "bin/karaf.bat", props, printOutput);
+ copyFilteredResourceToDir(karafBase, "bin/start.bat", props, printOutput);
+ copyFilteredResourceToDir(karafBase, "bin/stop.bat", props, printOutput);
+
+ try {
+ chmod(new File(karafBase, "bin/karaf"), "a+x");
+ chmod(new File(karafBase, "bin/start"), "a+x");
+ chmod(new File(karafBase, "bin/stop"), "a+x");
+ } catch (IOException e) {
+ LOGGER.debug("Could not set file mode on scripts.", e);
}
String javaOpts = settings.getJavaOpts();