SHorter lines and be more safe

2 files changed, 23 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e803209bd722..5fccf683ba9f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = opsu-git
 	pkgdesc = An open source osu!-client written in Java.
-	pkgver = 0.16.0.r0.gcf52c2f
-	pkgrel = 2
+	pkgver = 0.16.1.r4.ge9676f81
+	pkgrel = 1
 	url = https://itdelatrisu.github.io/opsu/
 	install = opsu.install
 	arch = any
diff --git a/PKGBUILD b/PKGBUILD
index 25303efc57ed..421e4df5e3b5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
 # Contributor in email: tpenguinltg <https://aur.archlinux.org/account/tpenguinltg/>
 
 pkgname=opsu-git
-pkgver=0.16.0.r0.gcf52c2f
-pkgrel=2
+pkgver=0.16.1.r4.ge9676f81
+pkgrel=1
 install=${pkgname%-git}.install
 provides=("${pkgname%-git}")
 conflicts=("${pkgname%-git}")
@@ -18,26 +18,29 @@ sha512sums=('SKIP'
 
 pkgver()
 {
-	cd "${srcdir}/${pkgname%-git}"
+	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.2;
+# template start; name=opsu; version=0.3;
 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'
-		 '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
+		 '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')
 
 build()
 {
-	cd "${srcdir}/${_pkgname}"
-	
+	cd "${srcdir}/${_pkgname}" || exit
+
 	# keep dependencies outside users home by setting GRADLE_USER_HOME
 	GRADLE_USER_HOME=. gradle jar -PXDG=true -PexcludeFFmpeg
 }
@@ -47,9 +50,16 @@ package()
 	# cut pkgver
 	_pkgver=$(git -C "${srcdir}/${_pkgname}" describe --tags | sed 's/-.*//')
 
-	install -Dm644 "${srcdir}/${_pkgname}/build/libs/${_pkgname}-${_pkgver}.jar" "${pkgdir}/usr/share/java/${_pkgname}/${_pkgname}.jar"
-	install -Dm644 "${srcdir}/${_pkgname}/res/logo.png" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${_pkgname}.png"
-	install -Dm644 "${_pkgname}.desktop" "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
-	install -Dm755 "${_pkgname}.sh" "${pkgdir}/usr/bin/${_pkgname}"
+	install -Dm644	"${srcdir}/${_pkgname}/build/libs/${_pkgname}-${_pkgver}.jar" \
+					"${pkgdir}/usr/share/java/${_pkgname}/${_pkgname}.jar"
+					
+	install -Dm644	"${srcdir}/${_pkgname}/res/logo.png" \
+					"${pkgdir}/usr/share/icons/hicolor/scalable/apps/${_pkgname}.png"
+					
+	install -Dm644	"${_pkgname}.desktop" \
+					"${pkgdir}/usr/share/applications/${_pkgname}.desktop"
+					
+	install -Dm755	"${_pkgname}.sh" \
+					"${pkgdir}/usr/bin/${_pkgname}"
 }
 # template end;