From bbba63eca5a0161a1b5b3bccb7af2070abc629db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sun, 28 Jun 2015 22:44:53 +0200 Subject: GH-1096 make ubuntu package work on both 32bit and 64bit machines --- .../package/ubuntu/multimc_1.0-1/DEBIAN/control | 11 - .../package/ubuntu/multimc_1.0-1/DEBIAN/postrm | 3 - .../ubuntu/multimc_1.0-1/opt/multimc/icon.svg | 1993 -------------------- .../ubuntu/multimc_1.0-1/opt/multimc/run.sh | 26 - .../usr/share/applications/multimc.desktop | 16 - .../package/ubuntu/multimc_1.1-1/DEBIAN/control | 11 + .../package/ubuntu/multimc_1.1-1/DEBIAN/postrm | 3 + .../ubuntu/multimc_1.1-1/opt/multimc/icon.svg | 1993 ++++++++++++++++++++ .../ubuntu/multimc_1.1-1/opt/multimc/run.sh | 32 + .../usr/share/applications/multimc.desktop | 16 + application/package/ubuntu/readme.md | 12 + 11 files changed, 2067 insertions(+), 2049 deletions(-) delete mode 100644 application/package/ubuntu/multimc_1.0-1/DEBIAN/control delete mode 100755 application/package/ubuntu/multimc_1.0-1/DEBIAN/postrm delete mode 100644 application/package/ubuntu/multimc_1.0-1/opt/multimc/icon.svg delete mode 100755 application/package/ubuntu/multimc_1.0-1/opt/multimc/run.sh delete mode 100755 application/package/ubuntu/multimc_1.0-1/usr/share/applications/multimc.desktop create mode 100644 application/package/ubuntu/multimc_1.1-1/DEBIAN/control create mode 100755 application/package/ubuntu/multimc_1.1-1/DEBIAN/postrm create mode 100644 application/package/ubuntu/multimc_1.1-1/opt/multimc/icon.svg create mode 100755 application/package/ubuntu/multimc_1.1-1/opt/multimc/run.sh create mode 100755 application/package/ubuntu/multimc_1.1-1/usr/share/applications/multimc.desktop create mode 100644 application/package/ubuntu/readme.md (limited to 'application') diff --git a/application/package/ubuntu/multimc_1.0-1/DEBIAN/control b/application/package/ubuntu/multimc_1.0-1/DEBIAN/control deleted file mode 100644 index 6d7bc057..00000000 --- a/application/package/ubuntu/multimc_1.0-1/DEBIAN/control +++ /dev/null @@ -1,11 +0,0 @@ -Package: multimc -Version: 1.0.1 -Architecture: amd64 -Maintainer: Petr Mrázek -Section: games -Priority: optional -Installed-Size: 75 -Depends: zenity, default-jre -Homepage: http://multimc.org -Description: A local install wrapper for MultiMC - diff --git a/application/package/ubuntu/multimc_1.0-1/DEBIAN/postrm b/application/package/ubuntu/multimc_1.0-1/DEBIAN/postrm deleted file mode 100755 index f9bbc8a7..00000000 --- a/application/package/ubuntu/multimc_1.0-1/DEBIAN/postrm +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -set -e -update-desktop-database diff --git a/application/package/ubuntu/multimc_1.0-1/opt/multimc/icon.svg b/application/package/ubuntu/multimc_1.0-1/opt/multimc/icon.svg deleted file mode 100644 index 178509ac..00000000 --- a/application/package/ubuntu/multimc_1.0-1/opt/multimc/icon.svg +++ /dev/null @@ -1,1993 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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/usr/share/applications/multimc.desktop b/application/package/ubuntu/multimc_1.0-1/usr/share/applications/multimc.desktop deleted file mode 100755 index 6002e686..00000000 --- a/application/package/ubuntu/multimc_1.0-1/usr/share/applications/multimc.desktop +++ /dev/null @@ -1,16 +0,0 @@ -[Desktop Entry] -Categories=Game; -Exec=/opt/multimc/run.sh -Icon=/opt/multimc/icon.svg -Keywords=game; -MimeType= -Name=MultiMC 5 -Path= -StartupNotify=true -Terminal=false -TerminalOptions= -Type=Application -X-DBUS-ServiceName= -X-DBUS-StartupType= -X-KDE-SubstituteUID=false -X-KDE-Username= diff --git a/application/package/ubuntu/multimc_1.1-1/DEBIAN/control b/application/package/ubuntu/multimc_1.1-1/DEBIAN/control new file mode 100644 index 00000000..3ab70f2f --- /dev/null +++ b/application/package/ubuntu/multimc_1.1-1/DEBIAN/control @@ -0,0 +1,11 @@ +Package: multimc +Version: 1.1-1 +Architecture: all +Maintainer: Petr Mrázek +Section: games +Priority: optional +Installed-Size: 75 +Depends: zenity, default-jre +Homepage: http://multimc.org +Description: A local install wrapper for MultiMC + diff --git a/application/package/ubuntu/multimc_1.1-1/DEBIAN/postrm b/application/package/ubuntu/multimc_1.1-1/DEBIAN/postrm new file mode 100755 index 00000000..f9bbc8a7 --- /dev/null +++ b/application/package/ubuntu/multimc_1.1-1/DEBIAN/postrm @@ -0,0 +1,3 @@ +#!/bin/sh +set -e +update-desktop-database diff --git a/application/package/ubuntu/multimc_1.1-1/opt/multimc/icon.svg b/application/package/ubuntu/multimc_1.1-1/opt/multimc/icon.svg new file mode 100644 index 00000000..178509ac --- /dev/null +++ b/application/package/ubuntu/multimc_1.1-1/opt/multimc/icon.svg @@ -0,0 +1,1993 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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.1-1/usr/share/applications/multimc.desktop b/application/package/ubuntu/multimc_1.1-1/usr/share/applications/multimc.desktop new file mode 100755 index 00000000..6002e686 --- /dev/null +++ b/application/package/ubuntu/multimc_1.1-1/usr/share/applications/multimc.desktop @@ -0,0 +1,16 @@ +[Desktop Entry] +Categories=Game; +Exec=/opt/multimc/run.sh +Icon=/opt/multimc/icon.svg +Keywords=game; +MimeType= +Name=MultiMC 5 +Path= +StartupNotify=true +Terminal=false +TerminalOptions= +Type=Application +X-DBUS-ServiceName= +X-DBUS-StartupType= +X-KDE-SubstituteUID=false +X-KDE-Username= 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. -- cgit v1.2.3