Clean up

5 files changed, 61 insertions, 55 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5f565bea6e68..084c97fc233f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = osu-lazer-git
 	pkgdesc = An open source, free-to-win rhythm game
-	pkgver = 2021.129.0.r15.cd8ef5373d
+	pkgver = 2021.416.0.r73.e227c076e5
 	pkgrel = 1
 	url = https://github.com/ppy/osu
 	arch = i686
@@ -23,9 +23,9 @@ pkgbase = osu-lazer-git
 	source = osu-lazer-git.desktop
 	source = osu-lazer-git.xml
 	sha256sums = SKIP
-	sha256sums = f540fb1fcb010768b8fade9a0d578b4ec9835afa1624bd9f9444fc2f12222f2c
-	sha256sums = 4154f98b615110e8ef34da7f9b6a150786cfca923807a8f9674115913a922be9
-	sha256sums = d97fd78ceacb419e36b0cd02e03394a0f7ad726f55a36c70fea190899911bd55
+	sha256sums = c49001b8faa530300a1d33d1dddb4d8a7c671f432c0417d357a6e5e83f65a275
+	sha256sums = b13d409e96084bc024b31fd39fa98545561e9d3b0270ce3247457910dfd8298c
+	sha256sums = fa5c5ebf1546e855103db2f97721448cb60c3cdf85c370e266c8a6eb0094e1b5
 
 pkgname = osu-lazer-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 08e1225c5d33..78d1eb200597 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 # Contributor: "donaldtrump" [AUR]
 
 pkgname='osu-lazer-git'
-pkgver='2021.129.0.r15.cd8ef5373d'
+pkgver='2021.416.0.r73.e227c076e5'
 pkgrel=1
 pkgdesc='An open source, free-to-win rhythm game'
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64')
@@ -23,42 +23,39 @@ source=("${pkgname}::git+https://github.com/ppy/osu.git"
         "${pkgname}.desktop"
         "${pkgname}.xml")
 sha256sums=('SKIP'
-            'f540fb1fcb010768b8fade9a0d578b4ec9835afa1624bd9f9444fc2f12222f2c'
-            '4154f98b615110e8ef34da7f9b6a150786cfca923807a8f9674115913a922be9'
-            'd97fd78ceacb419e36b0cd02e03394a0f7ad726f55a36c70fea190899911bd55')
-
+            'c49001b8faa530300a1d33d1dddb4d8a7c671f432c0417d357a6e5e83f65a275'
+            'b13d409e96084bc024b31fd39fa98545561e9d3b0270ce3247457910dfd8298c'
+            'fa5c5ebf1546e855103db2f97721448cb60c3cdf85c370e266c8a6eb0094e1b5')
 
 pkgver() {
-  cd "${srcdir}/${pkgname}"
-  printf "'%s'" "$(git describe --tags | sed 's/\([^-]*-\)g/r\1/;s/-/./g')"
+	cd "${pkgname}"
+	printf "'%s'" "$(git describe --tags | sed 's/\([^-]*-\)g/r\1/;s/-/./g')"
 }
 
 build() {
-  cd "${srcdir}/${pkgname}"
-  rm -rf 'compiled'
-  env DOTNET_CLI_TELEMETRY_OPTOUT="${DOTNET_CLI_TELEMETRY_OPTOUT-1}" dotnet publish 'osu.Desktop' \
-  --no-self-contained --configuration 'Release' \
-  --runtime "$(dotnet --info | grep -F 'RID' | cut -d ':' -f 2 | tr -d '[:space:]')" \
-  --output 'compiled'
+	cd "${pkgname}"
+	rm -rf 'compiled'
+	env DOTNET_CLI_TELEMETRY_OPTOUT="${DOTNET_CLI_TELEMETRY_OPTOUT-1}" dotnet publish 'osu.Desktop' \
+	--no-self-contained --configuration 'Release' \
+	--runtime "$(dotnet --info | grep -F 'RID' | cut -d ':' -f 2 | tr -d '[:space:]')" \
+	--output 'compiled'
 }
 
 package() {
-  # Launcher, Desktop entry, MIME
-  cd "${srcdir}"
-  install -D -m 755 "${pkgname}.sh" "${pkgdir}/usr/bin/osu-lazer"
-  install -D -m 644 "${pkgname}.desktop" \
-  "${pkgdir}/usr/share/applications/sh.ppy.osu.lazer.desktop"
-  install -D -m 644 "${pkgname}.xml" "${pkgdir}/usr/share/mime/packages/osu-lazer.xml"
-
-  # Runtime, Libraries
-  cd "${srcdir}/${pkgname}/compiled"
-  find . -type f -exec \
-  install -D -m 644 '{}' "${pkgdir}/usr/lib/osu-lazer/{}" ';'
-
-  # Icon, License
-  cd "${srcdir}/$pkgname"
-  install -D -m 644 'assets/lazer.png' "${pkgdir}/usr/share/icons/hicolor/1024x1024/apps/osu-lazer.png"
-  install -D -m 644 'assets/lazer-nuget.png' "${pkgdir}/usr/share/icons/hicolor/128x128/apps/osu-lazer.png"
-  install -D -m 644 'LICENCE' "${pkgdir}/usr/share/licenses/osu-lazer/LICENSE"
+	# Launcher, Desktop entry, MIME
+	install -D -m 755 "${pkgname}.sh" "${pkgdir}/usr/bin/osu-lazer"
+	install -D -m 644 "${pkgname}.desktop" \
+	"${pkgdir}/usr/share/applications/sh.ppy.osu.lazer.desktop"
+	install -D -m 644 "${pkgname}.xml" "${pkgdir}/usr/share/mime/packages/osu-lazer.xml"
+
+	# Runtime, Libraries
+	cd "${pkgname}/compiled"
+	find . -type f -exec \
+	install -D -m 644 '{}' "${pkgdir}/usr/lib/osu-lazer/{}" ';'
+
+	# Icon, License
+	cd ..
+	install -D -m 644 'assets/lazer.png' "${pkgdir}/usr/share/icons/hicolor/1024x1024/apps/osu-lazer.png"
+	install -D -m 644 'assets/lazer-nuget.png' "${pkgdir}/usr/share/icons/hicolor/128x128/apps/osu-lazer.png"
+	install -D -m 644 'LICENCE' "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE"
 }
-
diff --git a/osu-lazer-git.desktop b/osu-lazer-git.desktop
index ea6e14ddc7f1..25b2730747de 100644
--- a/osu-lazer-git.desktop
+++ b/osu-lazer-git.desktop
@@ -7,6 +7,5 @@ Comment=An open source, free-to-win rhythm game
 Icon=osu-lazer
 Exec=osu-lazer %F
 Terminal=false
-MimeType=application/x-osu-beatmap;application/x-osu-skin;application/x-osu-replay;
-Categories=Game
-
+MimeType=application/x-osu-storyboard;application/x-osu-skin-archive;application/x-osu-replay;application/x-osu-beatmap;x-osu-beatmap-archive;
+Categories=Game;
diff --git a/osu-lazer-git.sh b/osu-lazer-git.sh
index fcc9762827c2..adfe78c628dd 100644
--- a/osu-lazer-git.sh
+++ b/osu-lazer-git.sh
@@ -1,3 +1,2 @@
 #!/bin/sh
 env DOTNET_CLI_TELEMETRY_OPTOUT="${DOTNET_CLI_TELEMETRY_OPTOUT-1}" dotnet '/usr/lib/osu-lazer/osu!.dll' "$@"
-
diff --git a/osu-lazer-git.xml b/osu-lazer-git.xml
index 31e791807f5e..db7c33516715 100644
--- a/osu-lazer-git.xml
+++ b/osu-lazer-git.xml
@@ -1,21 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
-  <mime-type type="application/x-osu-beatmap">
-    <comment>osu! Beatmap</comment>
-    <icon name="application-x-osu-lazer"/>
-    <glob pattern="*.osz"/>
-  </mime-type>
+	<mime-type type="application/x-osu-storyboard">
+		<comment>osu! storyboard</comment>
+		<icon name="application-x-osu-lazer"/>
+		<glob pattern="*.osb"/>
+	</mime-type>
 
-  <mime-type type="application/x-osu-skin">
-    <comment>osu! Skin</comment>
-    <icon name="application-x-osu-lazer"/>
-    <glob pattern="*.osk"/>
-  </mime-type>
+	<mime-type type="application/x-osu-skin-archive">
+		<comment>osu! skin archive</comment>
+		<icon name="application-x-osu-lazer"/>
+		<glob pattern="*.osk"/>
+	</mime-type>
 
-  <mime-type type="application/x-osu-replay">
-    <comment>osu! Replay</comment>
-    <icon name="application-x-osu-lazer"/>
-    <glob pattern="*.osr"/>
-  </mime-type>
-</mime-info>
+	<mime-type type="application/x-osu-replay">
+		<comment>osu! replay</comment>
+		<icon name="application-x-osu-lazer"/>
+		<glob pattern="*.osr"/>
+	</mime-type>
+
+	<mime-type type="application/x-osu-beatmap">
+		<comment>osu! beatmap</comment>
+		<icon name="application-x-osu-lazer"/>
+		<glob pattern="*.osu"/>
+	</mime-type>
 
+	<mime-type type="application/x-osu-beatmap-archive">
+		<comment>osu! beatmap archive</comment>
+		<icon name="application-x-osu-lazer"/>
+		<glob pattern="*.osz"/>
+	</mime-type>
+</mime-info>