From a11162ec6118ca774c5397a9c5eb65c6787ec658 Mon Sep 17 00:00:00 2001 From: swirl Date: Sun, 26 Dec 2021 16:01:29 -0500 Subject: [PATCH] update README, delete RPM/Ubuntu packaging dirs Closes: #2 Update wording/information for packages add more of the individual Matrix rooms in case spaces don't work add PolyMC Discord to README Deleted RPM & Ubuntu/Debian packaging directories, will need to be moved to separate repositories. --- README.md | 21 +- launcher/package/rpm/MultiMC5.spec | 52 --- launcher/package/rpm/README.md | 12 - launcher/package/ubuntu/README.md | 14 - launcher/package/ubuntu/polymc/DEBIAN/control | 11 - launcher/package/ubuntu/polymc/DEBIAN/postrm | 3 - .../package/ubuntu/polymc/opt/polymc/icon.svg | 353 ------------------ .../package/ubuntu/polymc/opt/polymc/run.sh | 33 -- .../usr/share/applications/multimc.desktop | 16 - .../polymc/usr/share/man/man1/multimc.1 | 97 ----- .../usr/share/metainfo/multimc.metainfo.xml | 54 --- 11 files changed, 11 insertions(+), 655 deletions(-) delete mode 100644 launcher/package/rpm/MultiMC5.spec delete mode 100644 launcher/package/rpm/README.md delete mode 100644 launcher/package/ubuntu/README.md delete mode 100644 launcher/package/ubuntu/polymc/DEBIAN/control delete mode 100755 launcher/package/ubuntu/polymc/DEBIAN/postrm delete mode 100644 launcher/package/ubuntu/polymc/opt/polymc/icon.svg delete mode 100755 launcher/package/ubuntu/polymc/opt/polymc/run.sh delete mode 100755 launcher/package/ubuntu/polymc/usr/share/applications/multimc.desktop delete mode 100644 launcher/package/ubuntu/polymc/usr/share/man/man1/multimc.1 delete mode 100644 launcher/package/ubuntu/polymc/usr/share/metainfo/multimc.metainfo.xml diff --git a/README.md b/README.md index dda80ac3..23e99239 100644 --- a/README.md +++ b/README.md @@ -27,8 +27,8 @@ Experimental packages are available for Linux (non-portable) and Windows (portab - A full list of packages is available [here](https://jenkins.swurl.xyz/job/PolyMC/lastSuccessfulBuild/artifact/). - Last build status: https://jenkins.swurl.xyz/job/PolyMC/lastBuild/ -- [Linux (AMD64) System](https://jenkins.swurl.xyz/job/PolyMC/lastSuccessfulBuild/artifact/lin64-system.tar.zst) - this is a SYSTEM package that is intended to be installed via a package manager. This CAN NOT be used as a portable application! -- [Windows (32-bit)](https://jenkins.swurl.xyz/job/PolyMC/lastSuccessfulBuild/artifact/win32.zip) - this is a PORTABLE package. This package needs testing. +- [Linux (AMD64) System](https://jenkins.swurl.xyz/job/PolyMC/lastSuccessfulBuild/artifact/lin64-system.tar.zst) - this is a generic system package intended to be used as a base for making distro-specific packages. +- [Windows (32-bit)](https://jenkins.swurl.xyz/job/PolyMC/lastSuccessfulBuild/artifact/win32.zip) - this is a portable package, you can extract it anywhere and run it. This package needs testing. - MacOS currently does not have any packages. We are still working on setting up MacOS packaging. ### Building @@ -51,16 +51,17 @@ TODO Do whatever you want, we don't care. Just follow the license. If you have any questions about this feel free to ask in an issue. ## Help & Support -Feel free to create an issue if you need help. However, you should always ask the Matrix room. Be sure to enable spaces first (Settings -> Labs -> Spaces), and then you may join the space: +Feel free to create an issue if you need help. However, you might find it easier to ask in the Discord server. - +[![PolyMC Discord](https://img.shields.io/discord/923671181020766230?label=PolyMC%20Discord)](https://discord.gg/xq7fxrgtMP) -If this doesn't work for you, then you may simply join the support room: +For people who don't want to use Discord, we have a Matrix Space which is bridged to the discord server. Be sure to enable spaces first (Settings -> Labs -> Spaces), and then you may join the space: - +[![PolyMC Space](https://img.shields.io/matrix/polymc:polymc.org?label=PolyMC%20Space&server_fqdn=matrix.polymc.org)](https://matrix.to/#/#polymc:polymc.org) -Discord will be made soon. +Matrix's support for spaces is still in development, so if you have issues accessing rooms via the space, then you can join the rooms directly: -## Copyright -Copyright 2013-2021 MultiMC contributors -Copyright 2021 PolyMC contributors +[![Support](https://img.shields.io/matrix/support:polymc.org?label=%23support&server_fqdn=matrix.polymc.org)](https://matrix.to/#/#support:polymc.org) +[![Discussion](https://img.shields.io/matrix/discussion:polymc.org?label=%23discussion&server_fqdn=matrix.polymc.org)](https://matrix.to/#/#discussion:polymc.org) +[![Development](https://img.shields.io/matrix/development:polymc.org?label=%23development&server_fqdn=matrix.polymc.org)](https://matrix.to/#/#development:polymc.org) +[![News](https://img.shields.io/matrix/news:polymc.org?label=%23news&server_fqdn=matrix.polymc.org)](https://matrix.to/#/#news:polymc.org) diff --git a/launcher/package/rpm/MultiMC5.spec b/launcher/package/rpm/MultiMC5.spec deleted file mode 100644 index da93912b..00000000 --- a/launcher/package/rpm/MultiMC5.spec +++ /dev/null @@ -1,52 +0,0 @@ -Name: PolyMC -Version: 1.4 -Release: 3%{?dist} -Summary: A local install wrapper for PolyMC - -License: ASL 2.0 -URL: https://polymc.org -BuildArch: x86_64 - -Requires: zenity qt5-qtbase wget xrandr -Provides: polymc PolyMC polymc5 - -%description -A local install wrapper for PolyMC - -%prep - - -%build - -%install -mkdir -p %{buildroot}/opt/polymc -install -m 0644 ../ubuntu/polymc/opt/polymc/icon.svg %{buildroot}/opt/polymc/icon.svg -install -m 0755 ../ubuntu/polymc/opt/polymc/run.sh %{buildroot}/opt/polymc/run.sh -mkdir -p %{buildroot}/%{_datadir}/applications -install -m 0644 ../ubuntu/polymc/usr/share/applications/polymc.desktop %{buildroot}/%{_datadir}/applications/polymc.desktop -mkdir -p %{buildroot}/%{_datadir}/metainfo -install -m 0644 ../ubuntu/polymc/usr/share/metainfo/polymc.metainfo.xml %{buildroot}/%{_datadir}/metainfo/polymc.metainfo.xml -mkdir -p %{buildroot}/%{_mandir}/man1 -install -m 0644 ../ubuntu/polymc/usr/share/man/man1/polymc.1 %{buildroot}/%{_mandir}/man1/polymc.1 - -%files -%dir /opt/polymc -/opt/polymc/icon.svg -/opt/polymc/run.sh -%{_datadir}/applications/polymc.desktop -%{_datadir}/metainfo/polymc.metainfo.xml -%dir /usr/share/man/man1 -%{_mandir}/man1/polymc.1.gz - -%changelog -* Sun Oct 03 2021 imperatorstorm <30777770+ImperatorStorm@users.noreply.github.com> -- added manpage - -* Tue Jun 01 2021 kb1000 - 1.4-2 -- Add xrandr to the dependencies - -* Tue Dec 08 00:34:35 CET 2020 joshua-stone -- Add metainfo.xml for improving package metadata - -* Wed Nov 25 22:53:59 CET 2020 kb1000 -- Initial version of the RPM package, based on the Ubuntu package diff --git a/launcher/package/rpm/README.md b/launcher/package/rpm/README.md deleted file mode 100644 index 0c2b1e49..00000000 --- a/launcher/package/rpm/README.md +++ /dev/null @@ -1,12 +0,0 @@ -# What is this? -A simple RPM package for MultiMC that contains a script that downloads and installs real MultiMC on Red Hat based systems. - -It contains a `.desktop` file, a `.metainfo.xml` file, an icon, and a simple script that does the heavy lifting. - -# How to build this? -You need the `rpm-build` package. Switch into this directory, then run: -``` -rpmbuild --build-in-place -bb MultiMC5.spec -``` - -Replace the version with whatever is appropriate. diff --git a/launcher/package/ubuntu/README.md b/launcher/package/ubuntu/README.md deleted file mode 100644 index 93b72d9c..00000000 --- a/launcher/package/ubuntu/README.md +++ /dev/null @@ -1,14 +0,0 @@ -# What is this? -A simple Ubuntu package for PolyMC that contains a script that downloads and installs real PolyMC on Ubuntu based systems. - -It contains a `.desktop` file, an icon, and a simple script that does the heavy lifting. - -This is also the source for the files in the [RPM package](../rpm). If you rename, create or delete files here, you'll likely also have to update the RPM spec file there. - -# How to build this? -You need dpkg utils. Rename the `polymc` folder to `polymc_1.6-1` and then run: -``` -fakeroot dpkg-deb --build polymc_1.6-1 -``` - -Replace the version with whatever is appropriate. diff --git a/launcher/package/ubuntu/polymc/DEBIAN/control b/launcher/package/ubuntu/polymc/DEBIAN/control deleted file mode 100644 index 50040458..00000000 --- a/launcher/package/ubuntu/polymc/DEBIAN/control +++ /dev/null @@ -1,11 +0,0 @@ -Package: polymc -Version: 1.6-2 -Architecture: all -Maintainer: Petr Mrázek -Section: games -Priority: optional -Installed-Size: 75 -Depends: zenity, desktop-file-utils, libqt5widgets5, libqt5gui5, libqt5network5, libqt5core5a, libqt5xml5, libqt5concurrent5, wget -Recommends: openjdk-8-jre -Homepage: http://polymc.org -Description: A local install wrapper for PolyMC diff --git a/launcher/package/ubuntu/polymc/DEBIAN/postrm b/launcher/package/ubuntu/polymc/DEBIAN/postrm deleted file mode 100755 index f9bbc8a7..00000000 --- a/launcher/package/ubuntu/polymc/DEBIAN/postrm +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -set -e -update-desktop-database diff --git a/launcher/package/ubuntu/polymc/opt/polymc/icon.svg b/launcher/package/ubuntu/polymc/opt/polymc/icon.svg deleted file mode 100644 index 8bb0e289..00000000 --- a/launcher/package/ubuntu/polymc/opt/polymc/icon.svg +++ /dev/null @@ -1,353 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - diff --git a/launcher/package/ubuntu/polymc/opt/polymc/run.sh b/launcher/package/ubuntu/polymc/opt/polymc/run.sh deleted file mode 100755 index b59bd2bc..00000000 --- a/launcher/package/ubuntu/polymc/opt/polymc/run.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash - -INSTDIR="${XDG_DATA_HOME-$HOME/.local/share}/polymc" - -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 "https://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 -} - -runmmc() { - cd ${INSTDIR} - exec ./MultiMC "$@" -} - -if [[ ! -f ${INSTDIR}/MultiMC ]]; then - deploy - runmmc "$@" -else - runmmc "$@" -fi diff --git a/launcher/package/ubuntu/polymc/usr/share/applications/multimc.desktop b/launcher/package/ubuntu/polymc/usr/share/applications/multimc.desktop deleted file mode 100755 index e0456f89..00000000 --- a/launcher/package/ubuntu/polymc/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;Minecraft; -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/launcher/package/ubuntu/polymc/usr/share/man/man1/multimc.1 b/launcher/package/ubuntu/polymc/usr/share/man/man1/multimc.1 deleted file mode 100644 index b4af25e3..00000000 --- a/launcher/package/ubuntu/polymc/usr/share/man/man1/multimc.1 +++ /dev/null @@ -1,97 +0,0 @@ -'\" t -.\" Title: multimc -.\" Author: [see the "AUTHORS" section] -.\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 11/07/2021 -.\" Manual: \ \& -.\" Source: \ \& -.\" Language: English -.\" -.TH "MULTIMC" "1" "11/07/2021" "\ \&" "\ \&" -.\" ----------------------------------------------------------------- -.\" * Define some portability stuff -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" http://bugs.debian.org/507673 -.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.ie \n(.g .ds Aq \(aq -.el .ds Aq ' -.\" ----------------------------------------------------------------- -.\" * set default formatting -.\" ----------------------------------------------------------------- -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.\" ----------------------------------------------------------------- -.\" * MAIN CONTENT STARTS HERE * -.\" ----------------------------------------------------------------- -.SH "NAME" -multimc \- a launcher and instance manager for Minecraft\&. -.SH "SYNOPSIS" -.sp -\fBmultimc\fR [\fIOPTIONS\fR] -.SH "DESCRIPTION" -.sp -MultiMC is a custom launcher for Minecraft that allows you to easily manage multiple installations of Minecraft at once\&. It also allows you to easily install and remove mods by simply dragging and dropping\&. Here are the current features of MultiMC\&. -.SH "OPTIONS" -.PP -\fB\-d, \-\-dir\fR=\fIDIRECTORY\fR -.RS 4 -Use -\fIDIRECTORY\fR -as the MultiMC root\&. -.RE -.PP -\fB\-l, \-\-launch\fR=\fIINSTANCE_ID\fR -.RS 4 -Launch the instance specified by -\fIINSTANCE_ID\fR\&. -.RE -.PP -\fB\-\-alive\fR -.RS 4 -Write a small -\fIlive\&.check\fR -file after MultiMC starts\&. -.RE -.PP -\fB\-h, \-\-help\fR -.RS 4 -Display help text and exit\&. -.RE -.PP -\fB\-v, \-\-version\fR -.RS 4 -Display program version and exit\&. -.RE -.PP -\fB\-a, \-\-profile\fR=\fIPROFILE\fR -.RS 4 -Use the account specified by -\fIPROFILE\fR -(only valid in combination with \-\-launch)\&. -.RE -.SH "EXIT STATUS" -.PP -\fB0\fR -.RS 4 -Success -.RE -.PP -\fB1\fR -.RS 4 -Failure (syntax or usage error; configuration error; unexpected error)\&. -.RE -.SH "BUGS" -.sp -https://github\&.com/MultiMC/Launcher/issues -.SH "RESOURCES" -.sp -GitHub: https://github\&.com/MultiMC/Launcher -.sp -Main website: https://multimc\&.org -.SH "AUTHORS" -.sp -peterix diff --git a/launcher/package/ubuntu/polymc/usr/share/metainfo/multimc.metainfo.xml b/launcher/package/ubuntu/polymc/usr/share/metainfo/multimc.metainfo.xml deleted file mode 100644 index e3a67c59..00000000 --- a/launcher/package/ubuntu/polymc/usr/share/metainfo/multimc.metainfo.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - multimc - multimc.desktop - MultiMC - Manage Minecraft instances with ease - -

Overview

-

MultiMC is a free, open source launcher for Minecraft. It allows you to have multiple, cleanly separated instances of Minecraft (each with their own mods, texture packs, saves, etc) and helps you manage them and their associated options with a simple and powerful interface.

-

Features

-
    -
  • Manage multiple instances of Minecraft at once
    • -
  • Start Minecraft with a custom resolution
    • -
  • Change Java's runtime options (including memory options)
    • -
  • Shows Minecraft's console output in a colour coded window
    • -
  • Kill Minecraft easily if it crashes / freezes
    • -
  • Custom icons and groups for instances
    • -
  • Forge integration (automatic installation, version downloads, mod management)
    • -
  • Minecraft world management
    • -
  • Import and export Minecraft instances to share them with anyone
    • -
  • Supports every version of Minecraft that the vanilla launcher does
    • -
- - - - https://polymc.org/images/screenshots/main.png - - - https://polymc.org/images/screenshots/editmods.png - - - https://polymc.org/images/screenshots/version.png - - - https://polymc.org/images/screenshots/console.png - - - https://polymc.org/images/screenshots/settings.png - - - - - - https://polymc.org/ - https://discord.com/invite/0k2zsXGNHs0fE4Wm - https://github.com/MultiMC/Launcher/wiki/FAQ - https://github.com/MultiMC/Launcher/issues - https://translate.multimc.org/ - https://www.patreon.com/multimc - The MultiMC Team - CC0-1.0 - Apache-2.0 - peterix_at_gmail.com -