Update PKGBUILD based on feedback

1 files changed, 18 insertions, 19 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 5773616b2f6f..59022403b3ab 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,39 +1,38 @@
 # Maintainer: copygirl <copygirl@mcft.net>
 pkgname=vintagestory
 pkgver=1.5.0.1
-pkgrel=2
+pkgrel=3
 pkgdesc="An in-development indie sandbox game about innovation and exploration"
 arch=("any")
 url="https://www.vintagestory.at/"
 license=("custom")
 depends=("mono")
-options=()
-source=("https://account.vintagestory.at/files/stable/vs_archive_${pkgver}.tar.gz"
+source=("https://account.vintagestory.at/files/stable/vs_archive_$pkgver.tar.gz"
         "vintagestory.desktop"
         "vintagestory.sh")
 md5sums=("5399bbb72ef2cc35414ae78f1b5c0c61"
          "7cf82f218ba3026aff620b131b7dc581"
          "da232b56f48e047ec60791bb7d8b6398")
 
-package() {
-	# Create directory structure
-	install -dm 755 ${pkgdir}/usr/{bin,share/{,pixmaps,applications,fonts/TTF}}
-	# Copy console launcher .sh
-	install -Dm 755 ${pkgname}.sh ${pkgdir}/usr/bin/${pkgname}
-	# Copy application icon and .desktop launcher file
-	install -Dm 644 ${pkgname}/assets/gameicon.xpm ${pkgdir}/usr/share/pixmaps/${pkgname}.xpm
-	install -Dm 644 ${pkgname}.desktop ${pkgdir}/usr/share/applications/
-	# Copy fonts
-	install -Dm 644 ${pkgname}/assets/fonts/*.ttf ${pkgdir}/usr/share/fonts/TTF/
-	# Create symbolic links for any assets containing non-lowercase letters
-	IFS=$(echo -en "\n\b") # Loop on newlines, not spaces
-	for file in $(find ${pkgname}/assets/ -not -path "*/fonts/*" -regex ".*/.*[A-Z].*"); do
-		filename="$(basename -- "$file")"
+prepare() {
+	# Create symbolic links for any assets (excluding fonts) containing non-lowercase letters
+	find "$pkgname"/assets/ -not -path "*/fonts/*" -regex ".*/.*[A-Z].*" | while read -r file; do
+		local filename="$(basename -- "$file")"
 		# Check if filename is not the same as itself lowercased
 		if [ "$filename" != "${filename,,}" ]; then
-			ln -sf "$filename" "${file%/*}/${filename,,}"
+			ln -sf "$filename" "${file%/*}"/"${filename,,}"
 		fi
 	done
+}
+
+package() {
+	# Copy console launcher .sh
+	install -Dm755 "$pkgname".sh "$pkgdir"/usr/bin/"$pkgname"
+	# Copy application icon and .desktop launcher file
+	install -Dm644 "$pkgname"/assets/gameicon.xpm "$pkgdir"/usr/share/pixmaps/"$pkgname".xpm
+	install -Dm644 "$pkgname".desktop "$pkgdir"/usr/share/applications/"$pkgname".desktop
+	# Copy fonts
+	install -Dm644 -t "$pkgdir"/usr/share/fonts/TTF/ "$pkgname"/assets/fonts/*.ttf
 	# Move application files
-	mv ${pkgname} ${pkgdir}/usr/share/${pkgname}
+	mv "$pkgname" "$pkgdir"/usr/share/"$pkgname"
 }