Clean up pkgbuild

3 files changed, 19 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7503aad1d925..8cabe350e218 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,13 @@
 pkgbase = crocotile3d
 	pkgdesc = Tile-based 3D modeling application
 	pkgver = 2.2.6c
-	pkgrel = 2
+	pkgrel = 3
 	arch = x86_64
 	license = Unknown
 	options = !strip
 	source = https://jdigi.net/AUR/Crocotile3D/Crocotile3D_v2.2.6c_linux64.tar.gz
 	source = crocotile3d.desktop
-	source = icon.png
+	source = crocotile3d.png
 	sha256sums = 6bf3e623c640c7894f2d9c691c7bf1b826d523574d3fefc90527e2c2654ad812
 	sha256sums = SKIP
 	sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 7baa3e215923..c7fdeae25dd4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,29 +2,34 @@
 
 pkgname=crocotile3d
 pkgver=2.2.6c
-pkgrel=2
-pkgdesc='Tile-based 3D modeling application'
-arch=('x86_64')
-license=('Unknown')
-options=(!strip)
-source=("https://jdigi.net/AUR/Crocotile3D/Crocotile3D_v${pkgver}_linux64.tar.gz" "crocotile3d.desktop" "icon.png")
+pkgrel=3
+
+_install_location='/usr/share'
+
+source=("https://jdigi.net/AUR/Crocotile3D/Crocotile3D_v${pkgver}_linux64.tar.gz"
+        "${pkgname}.desktop"
+        "${pkgname}.png")
+
 sha256sums=('6bf3e623c640c7894f2d9c691c7bf1b826d523574d3fefc90527e2c2654ad812'
             SKIP
             SKIP)
 
-install_location='/usr/share'
+pkgdesc='Tile-based 3D modeling application'
+arch=('x86_64')
+license=('Unknown')
+options=(!strip)
 
 package() {
     # Install program
-    install -d "${pkgdir}${install_location}/${pkgname}"
-    cp -ar Crocotile3D_v${pkgver}_linux64/* "${pkgdir}${install_location}/${pkgname}/"
-    chmod -R 755 "${pkgdir}${install_location}/${pkgname}"
+    install -d "${pkgdir}${_install_location}/${pkgname}"
+    cp -ar Crocotile3D_v${pkgver}_linux64/* "${pkgdir}${_install_location}/${pkgname}/"
+    chmod -R 755 "${pkgdir}${_install_location}/${pkgname}"
     
     # Symlink executable
     mkdir -p "${pkgdir}/usr/bin"
-    ln -s "${install_location}/${pkgname}/${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
+    ln -s "${_install_location}/${pkgname}/${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
     
     # Install desktop entry
     install -Dm644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-    install -Dm644 "${srcdir}/icon.png" "${pkgdir}/usr/share/icons/crocotile3d.png"
+    install -Dm644 "${srcdir}/${pkgname}.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
 }
diff --git a/icon.png b/crocotile3d.png
index e64d3fd6cec5..e64d3fd6cec5 100644
--- a/icon.png
+++ b/crocotile3d.png