From 29edfba04483169f356d598decdcb54ef592d91c Mon Sep 17 00:00:00 2001
From: Automatic Release Builder <build@flightgear.org>
Date: Tue, 17 Nov 2020 13:47:50 +0000
Subject: [PATCH] AppImage: fix library paths

Fix spelling of the plugin path, and remove setting LD_LIBRARY_PATH
at all, to avoid breaking other apps we launch (eg browser).
---
 build_appimage.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/build_appimage.sh b/build_appimage.sh
index e7a0016..bf1a46c 100755
--- a/build_appimage.sh
+++ b/build_appimage.sh
@@ -61,14 +61,16 @@ sed -i 's/^Categor.*/&;/ ; s/^Keyword.*/&;/ ; s/1\.1/1\.0/' appdir/usr/share/app
 
 #generate AppRun script
 
+# Note: don't set LD_LIBRARY_PATH here.
+# if you do, you need to add code to unset it *sinde* FlightGear (eg, bootstrap.cxx), 
+# so that fork-ed processes don't inherit the value. For an example see:
+# https://github.com/KDAB/hotspot/blob/master/src/main.cpp#L87
+
 cat << 'EOF' > appdir/AppRun
 #!/bin/bash
 HERE="$(dirname "$(readlink -f "${0}")")"
 export SIMGEAR_TLS_CERT_PATH=$HERE/usr/ssl/cacert.pem
-echo SIMGEAR_TLS_CERT_PATH=$SIMGEAR_TLS_CERT_PATH
-export LD_LIBRARY_PATH=${HERE}/usr/lib:${LD_LIBRARY_PATH}
-export OSG_LIBARARY_PATH=${HERE}/usr/lib
-echo LD_LIBRARY_PATH=$LD_LIBRARY_PATH
+export OSG_LIBRARY_PATH=${HERE}/usr/lib
 exec "${HERE}/usr/bin/fgfs" "$@"
 EOF