[karaf] branch karaf-4.1.x updated: [KARAF-5886] Improve setting LD_LIBRARY_PATH

[flange]

This is an automated email from the ASF dual-hosted git repository.

flange pushed a commit to branch karaf-4.1.x
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/karaf-4.1.x by this push:
     new 1c7882a  [KARAF-5886] Improve setting LD_LIBRARY_PATH
1c7882a is described below

commit 1c7882a3e9669134ef692d6dd90d28295a5f74cb
Author: Fabian Lange <lange.fab...@gmail.com>
AuthorDate: Tue Sep 4 16:16:42 2018 +0200

    [KARAF-5886] Improve setting LD_LIBRARY_PATH
---
 .../features/base/src/main/filtered-resources/resources/bin/inc   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git 
a/assemblies/features/base/src/main/filtered-resources/resources/bin/inc 
b/assemblies/features/base/src/main/filtered-resources/resources/bin/inc
index 11dfeef..f224ea1 100644
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/inc
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/inc
@@ -131,7 +131,11 @@ locateEtc() {
 
 setupNativePath() {
     # Support for loading native libraries
-    LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${KARAF_BASE}/lib:${KARAF_HOME}/lib"
+    if [ "x${LD_LIBRARY_PATH}" != "x" ]; then
+        
LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${KARAF_BASE}/lib:${KARAF_HOME}/lib"
+    else
+        LD_LIBRARY_PATH="${KARAF_BASE}/lib:${KARAF_HOME}/lib"
+    fi
 
     # For Cygwin, set PATH from LD_LIBRARY_PATH
     if ${cygwin}; then
@@ -316,4 +320,4 @@ convertPaths() {
             CLASSPATH=$(cygpath --path --windows "${CLASSPATH}")
         fi
     fi
-}
\ No newline at end of file
+}