GH-1096 make ubuntu package work on both 32bit and 64bit machines

7 files changed, 46 insertions, 28 deletions

diff --git a/application/package/ubuntu/multimc_1.0-1/opt/multimc/run.sh b/application/package/ubuntu/multimc_1.0-1/opt/multimc/run.sh
deleted file mode 100755
index 3d934037..00000000
--- a/application/package/ubuntu/multimc_1.0-1/opt/multimc/run.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-INSTDIR=~/MultiMC
-
-deploy() {
-    mkdir -p $INSTDIR
-    cd ${INSTDIR}
-
-    wget --progress=dot:force "http://files.multimc.org/downloads/mmc-stable-lin64.tar.gz" 2>&1 | sed -u 's/.* \([0-9]\+%\)\ \+\([0-9.]\+.\) \(.*\)/\1\n# Downloading at \2\/s, ETA \3/' | zenity --progress --auto-close --auto-kill --title="Downloading MultiMC..."
-
-    tar -xzf mmc-stable-lin64.tar.gz --strip-components=2
-    rm mmc-stable-lin64.tar.gz
-    chmod +x MultiMC
-    ./MultiMC
-}
-
-runmmc() {
-    cd ${INSTDIR}
-    ./MultiMC
-}
-
-if [[ ! -f ${INSTDIR}/MultiMC ]]; then
-    deploy
-else
-    runmmc
-fi
diff --git a/application/package/ubuntu/multimc_1.0-1/DEBIAN/control b/application/package/ubuntu/multimc_1.1-1/DEBIAN/control
index 6d7bc057..3ab70f2f 100644
--- a/application/package/ubuntu/multimc_1.0-1/DEBIAN/control
+++ b/application/package/ubuntu/multimc_1.1-1/DEBIAN/control
@@ -1,6 +1,6 @@
 Package: multimc
-Version: 1.0.1
-Architecture: amd64
+Version: 1.1-1
+Architecture: all
 Maintainer: Petr Mrázek <peterix@gmail.com>
 Section: games
 Priority: optional
diff --git a/application/package/ubuntu/multimc_1.0-1/DEBIAN/postrm b/application/package/ubuntu/multimc_1.1-1/DEBIAN/postrm
index f9bbc8a7..f9bbc8a7 100755
--- a/application/package/ubuntu/multimc_1.0-1/DEBIAN/postrm
+++ b/application/package/ubuntu/multimc_1.1-1/DEBIAN/postrm
diff --git a/application/package/ubuntu/multimc_1.0-1/opt/multimc/icon.svg b/application/package/ubuntu/multimc_1.1-1/opt/multimc/icon.svg
index 178509ac..178509ac 100644
--- a/application/package/ubuntu/multimc_1.0-1/opt/multimc/icon.svg
+++ b/application/package/ubuntu/multimc_1.1-1/opt/multimc/icon.svg
diff --git a/application/package/ubuntu/multimc_1.1-1/opt/multimc/run.sh b/application/package/ubuntu/multimc_1.1-1/opt/multimc/run.sh
new file mode 100755
index 00000000..7a215abd
--- /dev/null
+++ b/application/package/ubuntu/multimc_1.1-1/opt/multimc/run.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+INSTDIR=~/.multimc
+if [ `getconf LONG_BIT` = "64" ]
+then
+    PACKAGE="mmc-stable-lin64.tar.gz"
+else
+    PACKAGE="mmc-stable-lin32.tar.gz"
+fi
+
+deploy() {
+    mkdir -p $INSTDIR
+    cd ${INSTDIR}
+
+    wget --progress=dot:force "http://files.multimc.org/downloads/${PACKAGE}" 2>&1 | sed -u 's/.* \([0-9]\+%\)\ \+\([0-9.]\+.\) \(.*\)/\1\n# Downloading at \2\/s, ETA \3/' | zenity --progress --auto-close --auto-kill --title="Downloading MultiMC..."
+
+    tar -xzf ${PACKAGE} --transform='s,MultiMC/,,'
+    rm ${PACKAGE}
+    chmod +x MultiMC
+    ./MultiMC
+}
+
+runmmc() {
+    cd ${INSTDIR}
+    ./MultiMC
+}
+
+if [[ ! -f ${INSTDIR}/MultiMC ]]; then
+    deploy
+else
+    runmmc
+fi
diff --git a/application/package/ubuntu/multimc_1.0-1/usr/share/applications/multimc.desktop b/application/package/ubuntu/multimc_1.1-1/usr/share/applications/multimc.desktop
index 6002e686..6002e686 100755
--- a/application/package/ubuntu/multimc_1.0-1/usr/share/applications/multimc.desktop
+++ b/application/package/ubuntu/multimc_1.1-1/usr/share/applications/multimc.desktop
diff --git a/application/package/ubuntu/readme.md b/application/package/ubuntu/readme.md
new file mode 100644
index 00000000..907fd649
--- /dev/null
+++ b/application/package/ubuntu/readme.md
@@ -0,0 +1,12 @@
+# What is this?
+A simple ubuntu package for MultiMC that wraps the contains a script that downloads and installs real MultiMC on ubuntu based systems.
+
+It contains a `.dekstop` file, an icon, and a simple script that does the heavy lifting.
+
+# How to build this?
+You need dpkg utils and then run:
+```
+fakeroot dpkg-deb --build multimc_1.1-1
+```
+
+Replace the version with whatever is appropriate.