From 0972e57a5b44ebcdc118e4e6565f98e1fd3fc5e2 Mon Sep 17 00:00:00 2001 From: Florent Rougon Date: Tue, 23 Jun 2020 19:22:45 +0200 Subject: [PATCH] download_and_compile.sh: use the set_ld_library_path variable This improves readability a little bit. set_ld_library_path was defined but unused since commit a5e4c47f. Note that this variable must be set *after* the OpenBSD-specific code block because its definition relies on the value of 'paths', which is modified in said block. --- download_and_compile.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/download_and_compile.sh b/download_and_compile.sh index c06f08d..ea53c64 100755 --- a/download_and_compile.sh +++ b/download_and_compile.sh @@ -1383,7 +1383,6 @@ if _elementIn "FGFS" "${WHATTOBUILD[@]}" || \ paths="../../$SIMGEAR_INSTALL_DIR/lib:../../$OSG_INSTALL_DIR/lib:../../$OPENRTI_INSTALL_DIR/lib:../../$PLIB_INSTALL_DIR/lib" gdb="gdb" - set_ld_library_path="export LD_LIBRARY_PATH='$paths'\"\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}\"" common="" common="${common}#!/bin/sh\n" @@ -1398,7 +1397,8 @@ if _elementIn "FGFS" "${WHATTOBUILD[@]}" || \ common="${common}ulimit -d 4194304\n" fi - common="${common}export LD_LIBRARY_PATH='$paths'\"\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}\"\n" + set_ld_library_path="export LD_LIBRARY_PATH='$paths'\"\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}\"" + common="${common}${set_ld_library_path}\n" SCRIPT=run_fgfs.sh echo -en "$common" > $SCRIPT