You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2017/09/12 07:31:08 UTC
karaf git commit: [KARAF-5352] Use ${karaf.etc} to load
shell.init.script
Repository: karaf
Updated Branches:
refs/heads/karaf-4.1.x 66d062955 -> 3622c9b50
[KARAF-5352] Use ${karaf.etc} to load shell.init.script
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/3622c9b5
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/3622c9b5
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/3622c9b5
Branch: refs/heads/karaf-4.1.x
Commit: 3622c9b504d902859222fb870f8c22c822f701cd
Parents: 66d0629
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Mon Sep 11 14:48:02 2017 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Tue Sep 12 09:31:01 2017 +0200
----------------------------------------------------------------------
.../base/src/main/resources/resources/etc/system.properties | 2 +-
.../org/apache/karaf/instance/resources/etc/system.properties | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/3622c9b5/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 b9908e8..fb08abe 100644
--- a/assemblies/features/base/src/main/resources/resources/etc/system.properties
+++ b/assemblies/features/base/src/main/resources/resources/etc/system.properties
@@ -48,7 +48,7 @@ karaf.default.repository = system
# additional commands.
# Do not use absolute paths to avoid problems on windows.
#
-karaf.shell.init.script = etc/shell.init.script,etc/scripts/*.script
+karaf.shell.init.script = ${karaf.etc}/shell.init.script,${karaf.etc}/scripts/*.script
#
# Sets the maximum size of the shell command history. If not set,
http://git-wip-us.apache.org/repos/asf/karaf/blob/3622c9b5/instance/src/main/resources/org/apache/karaf/instance/resources/etc/system.properties
----------------------------------------------------------------------
diff --git a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/system.properties b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/system.properties
index 53655ec..567b47e 100644
--- a/instance/src/main/resources/org/apache/karaf/instance/resources/etc/system.properties
+++ b/instance/src/main/resources/org/apache/karaf/instance/resources/etc/system.properties
@@ -47,7 +47,7 @@ karaf.default.repository = system
# session. This script can be used to create aliases and define
# additional commands.
#
-karaf.shell.init.script = etc/shell.init.script,etc/scripts/*.script
+karaf.shell.init.script = ${karaf.etc}/shell.init.script,${karaf.etc}/scripts/*.script
#
# Sets the maximum size of the shell command history. If not set,