karaf git commit: [KARAF-5352] Implicitly use ${karaf.etc} for shell init scripts

[jbonofre]

Repository: karaf
Updated Branches:
  refs/heads/karaf-4.1.x 5a73cf492 -> 04dfa30af


[KARAF-5352] Implicitly use ${karaf.etc} for shell init scripts


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

Branch: refs/heads/karaf-4.1.x
Commit: 04dfa30afcecc9177b2822714736c1d4be2b4fd2
Parents: 5a73cf4
Author: Jean-Baptiste Onofré <jbono...@apache.org>
Authored: Mon Oct 16 08:10:18 2017 +0200
Committer: Jean-Baptiste Onofré <jbono...@apache.org>
Committed: Mon Oct 16 08:36:42 2017 +0200

----------------------------------------------------------------------
 .../base/src/main/resources/resources/etc/system.properties      | 4 +++-
 .../static/src/main/resources/resources/etc/system.properties    | 4 +++-
 .../org/apache/karaf/instance/resources/etc/system.properties    | 4 +++-
 .../main/java/org/apache/karaf/util/filesstream/FilesStream.java | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/04dfa30a/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..be76d42 100644
--- 
a/assemblies/features/base/src/main/resources/resources/etc/system.properties
+++ 
b/assemblies/features/base/src/main/resources/resources/etc/system.properties
@@ -47,7 +47,9 @@ karaf.default.repository = system
 # session.  This script can be used to create aliases and define
 # additional commands.
 #
-karaf.shell.init.script = 
${karaf.etc}/shell.init.script,${karaf.etc}/scripts/*.script
+# NB: ${karaf.etc} is implicitly added to the path, don't use absolute path 
here
+#
+karaf.shell.init.script = shell.init.script,scripts/*.script
 
 #
 # Sets the maximum size of the shell command history. If not set,

http://git-wip-us.apache.org/repos/asf/karaf/blob/04dfa30a/assemblies/features/static/src/main/resources/resources/etc/system.properties
----------------------------------------------------------------------
diff --git 
a/assemblies/features/static/src/main/resources/resources/etc/system.properties 
b/assemblies/features/static/src/main/resources/resources/etc/system.properties
index 6cfaca8..c5f8b4b 100644
--- 
a/assemblies/features/static/src/main/resources/resources/etc/system.properties
+++ 
b/assemblies/features/static/src/main/resources/resources/etc/system.properties
@@ -47,7 +47,9 @@ karaf.default.repository = system
 # session.  This script can be used to create aliases and define
 # additional commands.
 #
-karaf.shell.init.script = 
${karaf.etc}/shell.init.script,${karaf.etc}/scripts/*.script
+# NB: ${karaf.etc} is implicitly added to the path, don't use absolute path 
here
+#
+karaf.shell.init.script = shell.init.script,scripts/*.script
 
 #
 # Sets the maximum size of the shell command history. If not set,

http://git-wip-us.apache.org/repos/asf/karaf/blob/04dfa30a/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 567b47e..0835bbb 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,9 @@ karaf.default.repository = system
 # session.  This script can be used to create aliases and define
 # additional commands.
 #
-karaf.shell.init.script = 
${karaf.etc}/shell.init.script,${karaf.etc}/scripts/*.script
+# NB: ${karaf.etc} is implicitly added to the path, don't use absolute path 
here
+#
+karaf.shell.init.script = shell.init.script,scripts/*.script
 
 #
 # Sets the maximum size of the shell command history. If not set,

http://git-wip-us.apache.org/repos/asf/karaf/blob/04dfa30a/util/src/main/java/org/apache/karaf/util/filesstream/FilesStream.java
----------------------------------------------------------------------
diff --git 
a/util/src/main/java/org/apache/karaf/util/filesstream/FilesStream.java 
b/util/src/main/java/org/apache/karaf/util/filesstream/FilesStream.java
index b21cc38..bd0f52b 100644
--- a/util/src/main/java/org/apache/karaf/util/filesstream/FilesStream.java
+++ b/util/src/main/java/org/apache/karaf/util/filesstream/FilesStream.java
@@ -89,7 +89,7 @@ public final class FilesStream {
                 files.add(buf.toString());
             }
         }
-        Path cur = Paths.get(System.getProperty("karaf.base"));
+        Path cur = Paths.get(System.getProperty("karaf.etc"));
         return Stream.concat(
                 files.stream().map(cur::resolve),
                 generators.stream().flatMap(s -> files(cur, s)));