From d14a61b0df38d150e1449b19b7eee411e91e5211 Mon Sep 17 00:00:00 2001
From: Jan Dalheimer <jan@dalheimer.de>
Date: Mon, 29 Jun 2015 20:09:02 +0200
Subject: GH-1100 Fix issues with LD_* variables when restarting on updates
---
application/package/linux/MultiMC | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/application/package/linux/MultiMC b/application/package/linux/MultiMC
index c131cb36..78bc77e5 100755
--- a/application/package/linux/MultiMC
+++ b/application/package/linux/MultiMC
@@ -18,8 +18,8 @@ MMC_DIR="$(dirname "$(readlink -f "$0")")"
echo "MultiMC Dir: ${MMC_DIR}"
# Set up env - filter out input LD_ variables but pass them in under different names
-export GAME_LIBRARY_PATH=$LD_LIBRARY_PATH
-export GAME_PRELOAD=$LD_PRELOAD
+export GAME_LIBRARY_PATH=${GAME_LIBRARY_PATH:-${LD_LIBRARY_PATH}}
+export GAME_PRELOAD=${GAME_PRELOAD:-${LD_PRELOAD}}
export LD_LIBRARY_PATH="${MMC_DIR}/bin":$MMC_LIBRARY_PATH
export LD_PRELOAD=$MMC_PRELOAD
export QT_PLUGIN_PATH="${MMC_DIR}/plugins"
--
cgit