summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew <forkk@forkk.net>2013-10-01 16:30:30 -0500
committerAndrew <forkk@forkk.net>2013-10-01 16:30:30 -0500
commit1ed822d6e8591b09f33acccac79aa0c0611dfd8c (patch)
treeb6873b83167a3ad799140335c332e84f43f1bcf7
parent02a7d147ef79009cc1997f073b7348cbe5085aea (diff)
downloadMultiMC-1ed822d6e8591b09f33acccac79aa0c0611dfd8c.tar
MultiMC-1ed822d6e8591b09f33acccac79aa0c0611dfd8c.tar.gz
MultiMC-1ed822d6e8591b09f33acccac79aa0c0611dfd8c.tar.lz
MultiMC-1ed822d6e8591b09f33acccac79aa0c0611dfd8c.tar.xz
MultiMC-1ed822d6e8591b09f33acccac79aa0c0611dfd8c.zip
Made run script instal as executable.
Also fixed a small bug with the run script.
-rw-r--r--CMakeLists.txt2
-rwxr-xr-xpackage/linux/MultiMC3
2 files changed, 3 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 140037cb..b3b2df83 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -433,7 +433,7 @@ INSTALL(TARGETS MultiMC
BUNDLE DESTINATION . COMPONENT Runtime
RUNTIME DESTINATION bin COMPONENT Runtime
)
-INSTALL(FILES package/linux/MultiMC DESTINATION .)
+INSTALL(PROGRAMS package/linux/MultiMC DESTINATION .)
ENDIF()
ENDIF()
diff --git a/package/linux/MultiMC b/package/linux/MultiMC
index 297304cf..c8c1b55a 100755
--- a/package/linux/MultiMC
+++ b/package/linux/MultiMC
@@ -1,8 +1,9 @@
#!/bin/sh
# Basic start script for running MultiMC with the libs packaged with it.
-MMC_DIR=$(dirname "$0")
+MMC_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
cd "${MMC_DIR}"
+echo "MultiMC Dir: ${MMC_DIR}"
export LD_LIBRARY_PATH="${MMC_DIR}/lib":$LD_LIBRARY_PATH
export QT_PLUGIN_PATH="${MMC_DIR}/plugins"