summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Dalheimer <jan@dalheimer.de>2015-06-29 20:09:02 +0200
committerJan Dalheimer <jan@dalheimer.de>2015-06-29 20:22:04 +0200
commitd14a61b0df38d150e1449b19b7eee411e91e5211 (patch)
tree85df2035b892b0e04901ddaf5fac454e315a88a1
parentbbba63eca5a0161a1b5b3bccb7af2070abc629db (diff)
downloadMultiMC-d14a61b0df38d150e1449b19b7eee411e91e5211.tar
MultiMC-d14a61b0df38d150e1449b19b7eee411e91e5211.tar.gz
MultiMC-d14a61b0df38d150e1449b19b7eee411e91e5211.tar.lz
MultiMC-d14a61b0df38d150e1449b19b7eee411e91e5211.tar.xz
MultiMC-d14a61b0df38d150e1449b19b7eee411e91e5211.zip
GH-1100 Fix issues with LD_* variables when restarting on updates
-rwxr-xr-xapplication/package/linux/MultiMC4
1 files 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"