feat: add in RPM packaging and cleanup linux packaging (not aur)

.github/workflows/aur-publish.yml

@@ -22,7 +22,6 @@ jobs:
         uses: ./.github/actions/publish-to-aur
         with:
           version: ${{ steps.clean-version.outputs.replaced }}
-          copyFiles: ./packaging/aur/common
           workingDir: ./packaging/aur/atlauncher
           packageName: atlauncher
           aurUsername: ${{ secrets.AUR_USERNAME }}
@@ -34,7 +33,6 @@ jobs:
         uses: ./.github/actions/publish-to-aur
         with:
           version: ${{ steps.clean-version.outputs.replaced }}
-          copyFiles: ./packaging/aur/common
           workingDir: ./packaging/aur/atlauncher-bin
           packageName: atlauncher-bin
           aurUsername: ${{ secrets.AUR_USERNAME }}

.vscode/extensions.json

@@ -13,6 +13,7 @@
         "mrorz.language-gettext",
         "aaron-bond.better-comments",
         "mathiasfrohlich.kotlin",
-        "idleberg.innosetup"
+        "idleberg.innosetup",
+        "laurenttreguier.rpm-spec"
     ]
 }

CHANGELOG.md

@@ -15,6 +15,7 @@ This changelog only contains the changes that are unreleased. For changes for in
 - Add OS information to Google Analytics
 - Use newer universalJavaApplicationStub for OSX app
 - Add in debian packaging
+- Add in RPM packaging
 
 ### Fixes
 - Dialog when installing file from CurseForge not showing progress

README.md

@@ -5,8 +5,8 @@
 
 ## What is it
 
-ATLauncher is a Launcher for Minecraft which integrates multiple different ModPacks to allow you to download and install
-ModPacks easily and quickly.
+ATLauncher is a launcher for Minecraft which integrates multiple different modpacks to allow you to download and install
+modpacks easily and quickly.
 
 ## Links
 

packaging/aur/atlauncher-bin/PKGBUILD

@@ -6,8 +6,8 @@ pkgname=atlauncher-bin
 _upstreamname=ATLauncher
 pkgrel=1
 pkgver=3.4.2.6
-pkgdesc="A Launcher for Minecraft which integrates multiple different ModPacks to allow you to download and install
-ModPacks easily and quickly."
+pkgdesc="A launcher for Minecraft which integrates multiple different modpacks to allow you to download and install
+modpacks easily and quickly."
 arch=('any')
 url="https://atlauncher.com/"
 license=('GPL3')

packaging/aur/atlauncher-bin/atlauncher.desktop

@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=ATLauncher
 GenericName=ATLauncher
-Comment=A Launcher for Minecraft which integrates multiple different ModPacks to allow you to download and install ModPacks easily and quickly.
+Comment=A launcher for Minecraft which integrates multiple different modpacks to allow you to download and install modpacks easily and quickly.
 Exec=atlauncher
 Icon=/usr/share/pixmaps/atlauncher.png
 Terminal=false

packaging/aur/atlauncher/PKGBUILD

@@ -7,8 +7,8 @@ pkgname=atlauncher
 _upstreamname=ATLauncher
 pkgrel=1
 pkgver=3.4.2.6
-pkgdesc="A Launcher for Minecraft which integrates multiple different ModPacks to allow you to download and install
-ModPacks easily and quickly."
+pkgdesc="A launcher for Minecraft which integrates multiple different modpacks to allow you to download and install
+modpacks easily and quickly."
 arch=('any')
 url="https://github.com/ATLauncher/ATLauncher"
 license=('GPL3')

packaging/aur/atlauncher/atlauncher.desktop

@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=ATLauncher
 GenericName=ATLauncher
-Comment=A Launcher for Minecraft which integrates multiple different ModPacks to allow you to download and install ModPacks easily and quickly.
+Comment=A launcher for Minecraft which integrates multiple different modpacks to allow you to download and install modpacks easily and quickly.
 Exec=atlauncher
 Icon=/usr/share/pixmaps/atlauncher.png
 Terminal=false

packaging/debian/Dockerfile

@@ -1,9 +0,0 @@
-FROM debian
-
-ADD atlauncher /work/atlauncher
-
-RUN chmod -R 0755 /work
-
-WORKDIR /work
-
-RUN dpkg-deb --build atlauncher

packaging/debian/build.bat

@@ -1,8 +0,0 @@
-docker build -t atlauncher/debian .
-FOR /F "tokens=* USEBACKQ" %%F IN (`docker create -t atlauncher/debian`) DO (
-SET IMAGE_ID=%%F
-)
-
-mkdir out
-
-docker cp %IMAGE_ID%:/work/atlauncher.deb ./out/atlauncher_1.0-1.deb

packaging/linux/_common/atlauncher.desktop

@@ -1,11 +1,11 @@
 [Desktop Entry]
 Categories=Game;
 Exec=/opt/atlauncher/run.sh
-Icon=/opt/atlauncher/icon.svg
+Icon=atlauncher
 Keywords=game;Minecraft;
 MimeType=
 Name=ATLauncher
-Comment=A Launcher for Minecraft which integrates multiple different ModPacks to allow you to download and install ModPacks easily and quickly.
+Comment=A launcher for Minecraft which integrates multiple different modpacks to allow you to download and install modpacks easily and quickly.
 Path=
 StartupNotify=true
 Terminal=false

packaging/linux/_common/atlauncher.metainfo.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html -->
+<component type="desktop">
+    <id>atlauncher</id>
+    <metadata_license>MIT</metadata_license>
+    <name>ATLauncher</name>
+    <summary>A launcher for Minecraft which integrates multiple different modpacks to allow you to download and install modpacks easily and quickly.</summary>
+    <icon type="remote" width="500" height="500">https://atlauncher.com/assets/images/logo.png</icon>
+    <description>
+        <p>ATLauncher is a launcher for Minecraft which integrates multiple different modpacks to allow you to download and install modpacks easily and quickly.</p>
+        <p>ATLauncher has a few nice features including:</p>
+        <ul>
+            <li>Allows quick and easy install of modpacks, no more messing around trying to install mods</li>
+            <li>A range of different packs, and more being added all the time</li>
+            <li>Multiple instances. Install a pack as many times as you like without messing up a previous install</li>
+            <li>Multiple accounts allow you to login as different users from the one install</li>
+            <li>Private instances. This allows you to only install instances under your account so people can't mess up your worlds</li>
+            <li>1 click backup of your saves</li>
+            <li>Easy server creation from within the Launcher</li>
+            <li>Install packs from CurseForge and FTB</li>
+            <li>Mod management for instances, including auto download and installation of mods, maps and resource packs from CurseForge and Modrinth</li>
+            <li>Support for both Mojang and Microsoft accounts</li>
+            <li>More features always being added</li>
+        </ul>
+    </description>
+    <categories>
+        <category>Game</category>
+    </categories>
+    <url type="homepage">https://atlauncher.com/</url>
+    <url type="bugtracker">https://github.com/ATLauncher/ATLauncher/issues</url>
+    <url type="faq">https://atlauncher.com/help</url>
+    <url type="help">https://atl.pw/discord</url>
+    <url type="translate">https://translate.atlauncher.com/</url>
+    <url type="contact">https://atlauncher.com/contact-us</url>
+    <launchable type="desktop-id">atlauncher.desktop</launchable>
+    <releases>
+        <release date="2021-02-01" version="1"/>
+    </releases>
+    <project_license>GPL-3.0</project_license>
+    <developer_name>The ATLauncher Team</developer_name>
+    <screenshots>
+        <screenshot type="default">
+            <image type="source" width="1186" height="693">https://atlauncher.com/assets/images/features/home.png</image>
+        </screenshot>
+        <screenshot>
+            <image type="source" width="636" height="393">https://atlauncher.com/assets/images/features/console.png</image>
+        </screenshot>
+        <screenshot>
+            <image type="source" width="1186" height="693">https://atlauncher.com/assets/images/features/packs.png</image>
+        </screenshot>
+        <screenshot>
+            <image type="source" width="1186" height="693">https://atlauncher.com/assets/images/features/instances.png</image>
+        </screenshot>
+        <screenshot>
+            <image type="source" width="1186" height="693">https://atlauncher.com/assets/images/features/servers.png</image>
+        </screenshot>
+        <screenshot>
+            <image type="source" width="1186" height="693">https://atlauncher.com/assets/images/features/add-mods.png</image>
+        </screenshot>
+        <screenshot>
+            <image type="source" width="1186" height="693">https://atlauncher.com/assets/images/features/settings.png</image>
+        </screenshot>
+    </screenshots>
+    <update_contact>ryan.dowling_AT_atlauncher.com</update_contact>
+</component>

packaging/linux/build.bat

@@ -0,0 +1,8 @@
+@REM @REM Deb packaging
+docker build -t atlauncher/atlauncher-packaging-linux-deb -f deb/Dockerfile .
+docker run --rm -i -v %cd%\out:/work/out -w /work/out atlauncher/atlauncher-packaging-linux-deb dpkg-deb --build ../atlauncher atlauncher_1.0-1.deb
+
+@REM RPM packaging
+docker build -t atlauncher/atlauncher-packaging-linux-rpm -f rpm/Dockerfile .
+docker run --rm -i -v %cd%\out:/root/rpmbuild/RPMS/noarch -w /work atlauncher/atlauncher-packaging-linux-rpm rpmbuild -bb --build-in-place --target noarch atlauncher.spec
+

packaging/linux/deb/Dockerfile

@@ -0,0 +1,17 @@
+FROM debian:10
+LABEL maintainer="ryan.dowling@atlauncher.com"
+
+# add in all the files
+ADD deb/control /work/atlauncher/DEBIAN/control
+ADD deb/postrm /work/atlauncher/DEBIAN/postrm
+ADD _common/run.sh /work/atlauncher/opt/atlauncher/run.sh
+ADD _common/atlauncher.desktop /work/atlauncher/usr/share/applications/atlauncher.desktop
+ADD _common/atlauncher.metainfo.xml /work/atlauncher/usr/share/metainfo/atlauncher.metainfo.xml
+ADD _common/atlauncher.png /work/atlauncher/usr/share/pixmaps/atlauncher.png
+ADD _common/atlauncher.svg /work/atlauncher/usr/share/icons/hicolor/scalable/apps/atlauncher.svg
+
+# chmod to what is needed
+RUN chmod -R 0755 /work
+
+# set the workdir
+WORKDIR /work

packaging/linux/deb/control

@@ -6,5 +6,5 @@ Architecture: all
 Depends: default-jre-headless | java8-runtime-headless | java8-runtime | java-8-runtime, wget, desktop-file-utils
 Installed-Size: 2220
 Maintainer: Ryan Dowling <ryan.dowling@atlauncher.com>
-Description: ATLauncher is a Launcher for Minecraft which integrates multiple different ModPacks to allow you to download and install ModPacks easily and quickly.
+Description: A launcher for Minecraft which integrates multiple different modpacks to allow you to download and install modpacks easily and quickly.
 Homepage: https://atlauncher.com

packaging/linux/rpm/ATLauncher.spec

@@ -0,0 +1,58 @@
+Name:           atlauncher
+Version:        1.0
+Release:        1%{?dist}
+Summary:        A launcher for Minecraft which integrates multiple different modpacks to allow you to download and install modpacks easily and quickly.
+
+License:        GPLv3
+URL:            https://atlauncher.com
+
+BuildArch:      noarch
+
+BuildRequires:  libappstream-glib
+BuildRequires:  desktop-file-utils
+
+Requires:       wget
+Requires:       java >= 1:1.8.0
+Provides:       atlauncher
+
+%description
+A launcher for Minecraft which integrates multiple different modpacks to allow you to download and install modpacks easily and quickly.
+
+%prep
+
+
+%build
+
+%check
+appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/atlauncher.metainfo.xml
+desktop-file-validate %{buildroot}/%{_datadir}/applications/atlauncher.desktop
+
+%install
+mkdir -p %{buildroot}/opt/atlauncher
+install -m 0755 run.sh %{buildroot}/opt/atlauncher/run.sh
+
+mkdir -p %{buildroot}/usr/share/pixmaps
+install -m 0644 atlauncher.png %{buildroot}/usr/share/pixmaps/atlauncher.png
+
+mkdir -p %{buildroot}/usr/share/icons/hicolor/scalable/apps
+install -m 0644 atlauncher.svg %{buildroot}/usr/share/icons/hicolor/scalable/apps/atlauncher.svg
+
+mkdir -p %{buildroot}/%{_datadir}/applications
+install -m 0644 atlauncher.desktop %{buildroot}/%{_datadir}/applications/atlauncher.desktop
+
+mkdir -p %{buildroot}/%{_metainfodir}
+install -m 0644 atlauncher.metainfo.xml %{buildroot}/%{_metainfodir}/atlauncher.metainfo.xml
+
+%files
+%dir /opt/atlauncher
+/opt/atlauncher/run.sh
+/usr/share/pixmaps/atlauncher.png
+/usr/share/icons/hicolor/scalable/apps/atlauncher.svg
+%{_datadir}/applications/atlauncher.desktop
+%{_metainfodir}/atlauncher.metainfo.xml
+
+
+%changelog
+
+* Mon Feb 01 2021 RyanTheAllmighty <ryan.dowling@atlauncher.com> - 1.0-1
+- Initial build

packaging/linux/rpm/Dockerfile

@@ -0,0 +1,21 @@
+FROM fedora:33
+LABEL maintainer="ryan.dowling@atlauncher.com"
+
+# install dependencies
+RUN yum install -y rpmdevtools libappstream-glib desktop-file-utils \
+    && yum clean all\
+    && rm -rf /var/cache/yum
+
+# add in all the files
+ADD rpm/atlauncher.spec /work/atlauncher.spec
+ADD _common/run.sh /work/run.sh
+ADD _common/atlauncher.desktop /work/atlauncher.desktop
+ADD _common/atlauncher.metainfo.xml /work/atlauncher.metainfo.xml
+ADD _common/atlauncher.png /work/atlauncher.png
+ADD _common/atlauncher.svg /work/atlauncher.svg
+
+# chmod to what is needed
+RUN chmod -R 0755 /work
+
+# set the workdir
+WORKDIR /work