From 02a7d147ef79009cc1997f073b7348cbe5085aea Mon Sep 17 00:00:00 2001
From: Andrew <forkk@forkk.net>
Date: Tue, 1 Oct 2013 16:13:21 -0500
Subject: Add run script to install.

Also renamed "translations_target" to "translations". The old name was
dumb and annoying.
---
 package/linux/MultiMC | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'package/linux')

diff --git a/package/linux/MultiMC b/package/linux/MultiMC
index 235d17c5..297304cf 100755
--- a/package/linux/MultiMC
+++ b/package/linux/MultiMC
@@ -4,6 +4,8 @@
 MMC_DIR=$(dirname "$0")
 cd "${MMC_DIR}"
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"./lib"
-export QT_PLUGIN_PATH=$QT_PLUGIN_PATH:"."
-exec ./bin/MultiMC
+export LD_LIBRARY_PATH="${MMC_DIR}/lib":$LD_LIBRARY_PATH
+export QT_PLUGIN_PATH="${MMC_DIR}/plugins"
+export QT_FONTPATH="${MMC_DIR}/fonts"
+exec ${MMC_DIR}/bin/MultiMC -d ${MMC_DIR} $@
+
-- 
cgit 


From 1ed822d6e8591b09f33acccac79aa0c0611dfd8c Mon Sep 17 00:00:00 2001
From: Andrew <forkk@forkk.net>
Date: Tue, 1 Oct 2013 16:30:30 -0500
Subject: Made run script instal as executable.

Also fixed a small bug with the run script.
---
 CMakeLists.txt        | 2 +-
 package/linux/MultiMC | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'package/linux')

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"
-- 
cgit 


From 349553349c7fdee93f72bcfbb44630f4cf2ae9c3 Mon Sep 17 00:00:00 2001
From: Andrew <forkk@forkk.net>
Date: Tue, 1 Oct 2013 16:40:51 -0500
Subject: Fixed an issue with the run script on Debian.

---
 package/linux/MultiMC | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package/linux')

diff --git a/package/linux/MultiMC b/package/linux/MultiMC
index c8c1b55a..d9f9dd5d 100755
--- a/package/linux/MultiMC
+++ b/package/linux/MultiMC
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Basic start script for running MultiMC with the libs packaged with it.
 
-MMC_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+MMC_DIR="$( cd "$( dirname "$0" )" && pwd )"
 cd "${MMC_DIR}"
 echo "MultiMC Dir: ${MMC_DIR}"
 
-- 
cgit 


From 7b863f97f7c4e45ab617a57e2f4e84fb8fc4ed37 Mon Sep 17 00:00:00 2001
From: Andrew <forkk@forkk.net>
Date: Tue, 1 Oct 2013 16:47:59 -0500
Subject: Set run script to load libs from bin folder.

I'd really like to put them in a separate "lib" folder, but CMake
doesn't want to.
---
 package/linux/MultiMC | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package/linux')

diff --git a/package/linux/MultiMC b/package/linux/MultiMC
index d9f9dd5d..6e77a632 100755
--- a/package/linux/MultiMC
+++ b/package/linux/MultiMC
@@ -5,7 +5,7 @@ MMC_DIR="$( cd "$( dirname "$0" )" && pwd )"
 cd "${MMC_DIR}"
 echo "MultiMC Dir: ${MMC_DIR}"
 
-export LD_LIBRARY_PATH="${MMC_DIR}/lib":$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH="${MMC_DIR}/bin":$LD_LIBRARY_PATH
 export QT_PLUGIN_PATH="${MMC_DIR}/plugins"
 export QT_FONTPATH="${MMC_DIR}/fonts"
 exec ${MMC_DIR}/bin/MultiMC -d ${MMC_DIR} $@
-- 
cgit