resource-agents: Improve LD_LIBRARY_PATH handling by SAP*

This is a backport from the Heartbeat resource agents repository. Author: Dejan Muhamedagic (dejan at hello-penguin com) http://hg.linux-ha.org/agents/rev/2773e5850003 Signed-off-by: Lon Hohberger <lhh@redhat.com>
ClusterLabs · Jan 25, 2011 · 394c23c · 394c23c
1 parent 9478573
commit 394c23c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/rgmanager/src/resources/SAPDatabase b/rgmanager/src/resources/SAPDatabase
@@ -993,7 +993,8 @@ fi
 
 # as root user we need the library path to the SAP kernel to be able to call executables
 if [ `echo $LD_LIBRARY_PATH | grep -c "^$DIR_EXECUTABLE\>"` -eq 0 ]; then
-  LD_LIBRARY_PATH=$DIR_EXECUTABLE:$LD_LIBRARY_PATH; export LD_LIBRARY_PATH
+  LD_LIBRARY_PATH=$DIR_EXECUTABLE${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH
+  export LD_LIBRARY_PATH
 fi
 sidadm="`echo $SID | tr [:upper:] [:lower:]`adm"
 

diff --git a/rgmanager/src/resources/SAPInstance b/rgmanager/src/resources/SAPInstance
@@ -566,7 +566,8 @@ fi
 
 # as root user we need the library path to the SAP kernel to be able to call sapcontrol
 if [ `echo $LD_LIBRARY_PATH | grep -c "^$DIR_EXECUTABLE\>"` -eq 0 ]; then
-  LD_LIBRARY_PATH=$DIR_EXECUTABLE:$LD_LIBRARY_PATH; export LD_LIBRARY_PATH
+  LD_LIBRARY_PATH=$DIR_EXECUTABLE${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH
+  export LD_LIBRARY_PATH
 fi
 sidadm="`echo $SID | tr [:upper:] [:lower:]`adm"