karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject [1/2] karaf git commit: Fix startup scripts on windows
Date Tue, 06 Dec 2016 23:25:36 GMT
Repository: karaf
Updated Branches:
  refs/heads/master 760fa3f31 -> b1fda013d


Fix startup scripts on windows

Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/c31a03a9
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/c31a03a9
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/c31a03a9

Branch: refs/heads/master
Commit: c31a03a9e8d0d7ce228e9539d61636dbe2dae8ed
Parents: 760fa3f
Author: Guillaume Nodet <gnodet@apache.org>
Authored: Wed Dec 7 00:03:04 2016 +0100
Committer: Guillaume Nodet <gnodet@apache.org>
Committed: Wed Dec 7 00:03:04 2016 +0100

----------------------------------------------------------------------
 .../base/src/main/resources/resources/etc/system.properties       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/c31a03a9/assemblies/features/base/src/main/resources/resources/etc/system.properties
----------------------------------------------------------------------
diff --git a/assemblies/features/base/src/main/resources/resources/etc/system.properties b/assemblies/features/base/src/main/resources/resources/etc/system.properties
index 6c4525c..b9908e8 100644
--- a/assemblies/features/base/src/main/resources/resources/etc/system.properties
+++ b/assemblies/features/base/src/main/resources/resources/etc/system.properties
@@ -46,8 +46,9 @@ karaf.default.repository = system
 # Location of a shell script that will be run when starting a shell
 # session.  This script can be used to create aliases and define
 # additional commands.
+# Do not use absolute paths to avoid problems on windows.
 #
-karaf.shell.init.script = ${karaf.etc}/shell.init.script,${karaf.etc}/scripts/*.script
+karaf.shell.init.script = etc/shell.init.script,etc/scripts/*.script
 
 #
 # Sets the maximum size of the shell command history. If not set,


Mime
View raw message