[asterisk-commits] seanbright: trunk r354314 - /trunk/contrib/scripts/live_ast

[SVN commits to the Asterisk project]

Author: seanbright
Date: Tue Feb  7 12:07:16 2012
New Revision: 354314

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=354314
Log:
Continuation of last patch - since LIVE_AST_LD_PATH_EXTRA will now never
be empty, don't check for it, instead of check if LD_LIBRARY_PATH is
already set and if so, append LIVE_AST_LD_PATH_EXTRA properly.

Modified:
    trunk/contrib/scripts/live_ast

Modified: trunk/contrib/scripts/live_ast
URL: http://svnview.digium.com/svn/asterisk/trunk/contrib/scripts/live_ast?view=diff&rev=354314&r1=354313&r2=354314
==============================================================================
--- trunk/contrib/scripts/live_ast (original)
+++ trunk/contrib/scripts/live_ast Tue Feb  7 12:07:16 2012
@@ -157,9 +157,12 @@
 LIVE_AST_LD_PATH_EXTRA="$BASE_DIR/usr/lib:$LIVE_AST_LD_PATH_EXTRA"
 
 set_ld_env() {
-  if [ "$LIVE_AST_LD_PATH_EXTRA$LD_LIBRARY_PATH" = '' ]; then return; fi
-
-  LD_LIBRARY_PATH=`echo $LIVE_AST_LD_PATH_EXTRA $LD_LIBRARY_PATH | tr ' ' :`
+  if [ "$LD_LIBRARY_PATH" = '' ]; then
+    LD_LIBRARY_PATH="$LIVE_AST_LD_PATH_EXTRA"
+  else
+    LD_LIBRARY_PATH=`echo $LD_LIBRARY_PATH | tr ' ' :`
+    LD_LIBRARY_PATH="$LIVE_AST_LD_PATH_EXTRA:$LD_LIBRARY_PATH"
+  fi
   export LD_LIBRARY_PATH
 }