upgpkg: opsu-git 0.16.1.r6.g28003bfb-2

5 files changed, 34 insertions, 54 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5fccf683ba9f..954c71dafe5e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,28 +1,26 @@
 pkgbase = opsu-git
 	pkgdesc = An open source osu!-client written in Java.
-	pkgver = 0.16.1.r4.ge9676f81
-	pkgrel = 1
+	pkgver = 0.16.1.r6.g28003bfb
+	pkgrel = 2
 	url = https://itdelatrisu.github.io/opsu/
-	install = opsu.install
 	arch = any
 	license = GPL3
-	makedepends = java-environment
+	makedepends = java-environment<17
 	makedepends = java-web-start
-	makedepends = gradle
+	makedepends = gradle6
 	makedepends = git
-	depends = java-runtime
+	depends = java-runtime<17
 	depends = bash
 	depends = hicolor-icon-theme
 	depends = xorg-xrandr
 	optdepends = ffmpeg: Background video playback
 	provides = opsu
 	conflicts = opsu
-	source = opsu::git://github.com/itdelatrisu/opsu.git
-	source = opsu.sh
-	source = opsu.desktop
+	source = opsu-git::git+https://github.com/itdelatrisu/opsu.git
+	source = opsu-git.sh
+	source = opsu-git.desktop
 	sha512sums = SKIP
 	sha512sums = 4b065052fef55e1860a51dfa5af080930b1001e4c82cd8b3b0383bd68b239d382d788408235a7cb4fb4a1d04123a6049188a2e2c2d0e5fd08a3deb69da25fc2d
 	sha512sums = 94f6f2f2a7f5f104e1002869099daf2bc033764373c8f51b204152d6821070e4be25a0001bfdb8b5b2ef25046b0be214f640de5ff994eda9126a48495104e745
 
 pkgname = opsu-git
-
diff --git a/PKGBUILD b/PKGBUILD
index cc0f160765f5..293ce3c57bdd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,64 +2,60 @@
 # Contributor in comments: Misc <https://aur.archlinux.org/account/misc/>
 # Contributor in comments: SajeOne <https://aur.archlinux.org/account/SajeOne/>
 # Contributor in email: tpenguinltg <https://aur.archlinux.org/account/tpenguinltg/>
+# shellcheck shell=bash
+# shellcheck disable=2034,2154
 
 pkgname=opsu-git
-pkgver=0.16.1.r4.ge9676f81
-pkgrel=1
-install=${pkgname%-git}.install
-provides=("${pkgname%-git}")
-conflicts=("${pkgname%-git}")
-source=("${pkgname%-git}::git://github.com/itdelatrisu/opsu.git"
-        "${pkgname%-git}.sh"
-        "${pkgname%-git}.desktop")
+_pkgname=${pkgname%-git}
+pkgver=0.16.1.r6.g28003bfb
+pkgrel=2
+provides=("$_pkgname")
+conflicts=("$_pkgname")
+source=("$pkgname::git+https://github.com/itdelatrisu/opsu.git"
+        "$pkgname.sh"
+        "$pkgname.desktop")
 sha512sums=('SKIP'
             '4b065052fef55e1860a51dfa5af080930b1001e4c82cd8b3b0383bd68b239d382d788408235a7cb4fb4a1d04123a6049188a2e2c2d0e5fd08a3deb69da25fc2d'
             '94f6f2f2a7f5f104e1002869099daf2bc033764373c8f51b204152d6821070e4be25a0001bfdb8b5b2ef25046b0be214f640de5ff994eda9126a48495104e745')
 
-pkgver()
-{
-    cd "$srcdir/${pkgname%-git}" || exit
-    git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
-}
-
-_pkgname=${pkgname%-git}
-# template start; name=opsu; version=0.4;
 pkgdesc="An open source osu!-client written in Java."
 arch=('any')
 url="https://itdelatrisu.github.io/opsu/"
 license=('GPL3')
-depends=('java-runtime' 'bash' 'hicolor-icon-theme'
+depends=('java-runtime<17' 'bash' 'hicolor-icon-theme'
          'xorg-xrandr'  # "[…] is a dependency for LWJGL. Had to search around for the fix after the
                         # application was throwing an unhandled exception because it couldn't
                         # detect monitors. Any chance this could be added to the dep list?"
                         # https://aur.archlinux.org/account/SajeOne
          )
 optdepends=('ffmpeg: Background video playback')
-makedepends=('java-environment' 'java-web-start' 'gradle' 'git')
+makedepends=('java-environment<17' 'java-web-start' 'gradle6' 'git')
+
+pkgver() {
+    cd "$pkgname" || exit
+    git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+}
 
-build()
-{
-    cd "$srcdir/$_pkgname" || exit
+build() {
+    cd "$pkgname" || exit
 
     # keep dependencies outside users home by setting GRADLE_USER_HOME
-    GRADLE_USER_HOME="$srcdir/gradle" gradle jar -PXDG=true -PexcludeFFmpeg
+    GRADLE_USER_HOME="GRADLE_USER_HOME" gradle6 jar -PXDG=true -PexcludeFFmpeg
 }
 
-package()
-{
+package() {
     # cut pkgver
-    _pkgver=$(git -C "$srcdir/$_pkgname" describe --tags | sed 's/-.*//')
+    _pkgver=$(git -C "$pkgname" describe --tags | sed 's/-.*//')
 
-    install -Dm644  "$srcdir/$_pkgname/build/libs/$_pkgname-$_pkgver.jar" \
+    install -Dm644  "$pkgname/build/libs/$_pkgname-$_pkgver.jar" \
                     "$pkgdir/usr/share/java/$_pkgname/$_pkgname.jar"
 
-    install -Dm644  "$srcdir/$_pkgname/res/logo.png" \
+    install -Dm644  "$pkgname/res/logo.png" \
                     "$pkgdir/usr/share/icons/hicolor/scalable/apps/$_pkgname.png"
 
-    install -Dm644  "$_pkgname.desktop" \
+    install -Dm644  "$pkgname.desktop" \
                     "$pkgdir/usr/share/applications/$_pkgname.desktop"
 
-    install -Dm755  "$_pkgname.sh" \
+    install -Dm755  "$pkgname.sh" \
                     "$pkgdir/usr/bin/$_pkgname"
 }
-# template end;
diff --git a/opsu.desktop b/opsu-git.desktop
index f7ccc409a6e2..f7ccc409a6e2 100644
--- a/opsu.desktop
+++ b/opsu-git.desktop
diff --git a/opsu.sh b/opsu-git.sh
index 6a97ebfd2b54..6a97ebfd2b54 100644
--- a/opsu.sh
+++ b/opsu-git.sh
diff --git a/opsu.install b/opsu.install
deleted file mode 100644
index 490e6177c129..000000000000
--- a/opsu.install
+++ /dev/null
@@ -1,14 +0,0 @@
-## arg 1:  the new package version
-post_install() {
-	if [[ ! "$1" < 0.15.0.r0.g0507374-1 ]]; then
-		echo "For video playback add the line 'FFmpegPath = /usr/bin/ffmpeg' to your config file: '\$XDG_CONFIG_HOME/opsu/.opsu.cfg'"
-	fi
-}
-
-## arg 1:  the new package version
-## arg 2:  the old package version
-post_upgrade() {
-	if [[ ! "$1" < 0.15.0.r0.g0507374-1 ]] && [[ "$2" < 0.15.0.r0.g0507374-1 ]]; then
-		echo "For video playback add the line 'FFmpegPath = /usr/bin/ffmpeg' to your config file: '\$XDG_CONFIG_HOME/opsu/.opsu.cfg'"
-	fi
-}