Update to 0.5.1 and refactor

3 files changed, 23 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f2c4396e8f3b..003d2457f9b8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = svetovid-lib
 	pkgdesc = Supplement Library for Introductory Programming Courses
-	pkgver = 0.5.0
-	pkgrel = 3
+	pkgver = 0.5.1
+	pkgrel = 1
 	url = https://github.com/ivanpribela/svetovid-lib
 	arch = any
 	license = APACHE
@@ -9,7 +9,7 @@ pkgbase = svetovid-lib
 	makedepends = inkscape
 	makedepends = git
 	depends = java-runtime
-	source = git+https://github.com/ivanpribela/svetovid-lib#commit=b7c003f8b277ed19be23b674c656b73b262e5769
+	source = git+https://github.com/ivanpribela/svetovid-lib#commit=a14c0bd96d5a57c24ad227872ed4a44d1d778e5e
 	sha512sums = SKIP
 
 pkgname = svetovid-lib
diff --git a/.gitignore b/.gitignore
index fac1438e284b..1d65adf6de3a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-pkg
-src
-svetovid-lib
-*.tar.zst
+*
+!PKGBUILD
+!.SRCINFO
diff --git a/PKGBUILD b/PKGBUILD
index 797314b3e0d9..a9a86592e62e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,37 +2,37 @@
 
 pkgbase=svetovid-lib
 pkgname=(svetovid-lib svetovid-lib-doc)
-pkgver=0.5.0
-_commit=b7c003f8b277ed19be23b674c656b73b262e5769
-pkgrel=3
+pkgver=0.5.1
+_commit=a14c0bd96d5a57c24ad227872ed4a44d1d778e5e
+pkgrel=1
 pkgdesc='Supplement Library for Introductory Programming Courses'
 arch=(any)
-url='https://github.com/ivanpribela/svetovid-lib'
-license=('APACHE')
-depends=('java-runtime')
-makedepends=('ant' 'inkscape' 'git')
-source=("git+https://github.com/ivanpribela/svetovid-lib#commit=${_commit}")
-sha512sums=('SKIP')
+url=https://github.com/ivanpribela/svetovid-lib
+license=(APACHE)
+depends=(java-runtime)
+makedepends=(ant inkscape git)
+source=("git+https://github.com/ivanpribela/svetovid-lib#commit=$_commit")
+sha512sums=(SKIP)
 
 build() {
-	cd "${pkgname}"
+	cd "$pkgname"
 
 	ant pack.jar
 	ant generate.apidoc
 }
 
 package_svetovid-lib() {
-	cd "${pkgname}"
+	cd "$pkgname"
 
-	install -Dm644 "dist/${pkgname}.jar" "${pkgdir}/usr/share/java/${pkgname}/${pkgname}.jar"
+	install -Dm644 "dist/$pkgname.jar" -t "$pkgdir/usr/share/java/$pkgname"
 
-	install -Dm644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-	install -Dm644 "NOTICE" "${pkgdir}/usr/share/licenses/${pkgname}/NOTICE"
+	install -Dm644 "LICENSE" -t "$pkgdir/usr/share/licenses/$pkgname"
+	install -Dm644 "NOTICE" -t "$pkgdir/usr/share/licenses/$pkgname"
 }
 
 package_svetovid-lib-doc() {
-	cd "${pkgbase}"
+	cd "$pkgbase"
 
-	install -dm755 "${pkgdir}/usr/share/doc"
-	cp -a "gendoc/api" "${pkgdir}/usr/share/doc/${pkgbase}"
+	install -d "$pkgdir/usr/share/doc"
+	cp -a "gendoc/api" "$pkgdir/usr/share/doc/$pkgbase"
 }