[karaf] branch master 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 master
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/master by this push:
     new ff94c61  [KARAF-5886] Improve setting LD_LIBRARY_PATH
ff94c61 is described below

commit ff94c61e0459f8bef01204be78aa2671aea5b4d1
Author: Fabian Lange <lange.fab...@gmail.com>
AuthorDate: Tue Sep 4 16:11:26 2018 +0200

    [KARAF-5886] Improve setting LD_LIBRARY_PATH
---
 .../base/src/main/filtered-resources/resources/bin/inc     | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 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 f9b7050..fe402ee 100644
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/inc
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/inc
@@ -140,7 +140,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
@@ -217,7 +221,7 @@ detectJVM() {
 }
 
 checkJvmVersion() {
-    # Use in priority xpg4 awk or nawk on SunOS as standard awk is outdated 
+    # Use in priority xpg4 awk or nawk on SunOS as standard awk is outdated
     AWK=awk
     if ${solaris}; then
         if [ -x /usr/xpg4/bin/awk ]; then
@@ -226,10 +230,10 @@ checkJvmVersion() {
             AWK=/usr/bin/nawk
         fi
     fi
-    
+
     VERSION=$("${JAVA}" -version 2>&1 | ${AWK} -F '"' '/version/ {print $2}' | 
sed -e 's/_.*//g; s/^1\.//g; s/\..*//g; s/-.*//g;')
-    
-    # java must be at least version 8 
+
+    # java must be at least version 8
     if [ "${VERSION}" -lt "8" ]; then
         die "JVM must be greater than 1.8"
     fi