Drastically simplify pkgbuild structure

2 files changed, 29 insertions, 78 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 788ca8d5b552..143db9a3e5e1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -15,13 +15,13 @@ pkgbase = pico-8
 	source = pico-8.xml
 	sha256sums = 272f33c38a74456a4d2597a6b1d0c6ee9695d0e47f31ce08018c24a78e62759e
 	sha256sums = 2776340602e7ad29898500c4b2162bb5dd7746b933fb443b551e25a751e375e7
-	source_i686 = hib://pico-8_0.2.5c_i386.zip
+	source_i686 = file://pico-8_0.2.5c_i386.zip
 	sha256sums_i686 = 3ddc7ae2fc67352cabda1935114403cc70f408f73d25faee5385d85faa071f2f
-	source_x86_64 = hib://pico-8_0.2.5c_amd64.zip
+	source_x86_64 = file://pico-8_0.2.5c_amd64.zip
 	sha256sums_x86_64 = a433059942d5a4275d879c718a7d7d1611068d65f9cf57782ffefb11d7e2c8db
-	source_armv6h = hib://pico-8_0.2.5c_raspi.zip
+	source_armv6h = file://pico-8_0.2.5c_raspi.zip
 	sha256sums_armv6h = 56a1239373f1681104a76ca24a1b3534079707ed787cde5d948ed71c651ba59e
-	source_armv7h = hib://pico-8_0.2.5c_raspi.zip
+	source_armv7h = file://pico-8_0.2.5c_raspi.zip
 	sha256sums_armv7h = 56a1239373f1681104a76ca24a1b3534079707ed787cde5d948ed71c651ba59e
 
 pkgname = pico-8
diff --git a/PKGBUILD b/PKGBUILD
index 9827c879aa35..990bf8900124 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,26 +11,16 @@ license=('custom:commercial')
 depends=('glibc' 'hicolor-icon-theme')
 replaces=('pico8-bin')
 
-# Lexaloffle uses other terms for architecture
-_arch_i686="i386"
-_arch_x86_64="amd64"
-_arch_arm="raspi"
 
-# Source filenames
-_file_desktop="pico-8.desktop"
-_file_mime="pico-8.xml"
-_file_zip_i686="pico-8_${pkgver}_${_arch_i686}.zip"
-_file_zip_x86_64="pico-8_${pkgver}_${_arch_x86_64}.zip"
-_file_zip_arm="pico-8_${pkgver}_${_arch_arm}.zip"
+_file_zip_arm="${pkgname}_${pkgver}_raspi.zip"
 
-# Source declaration
-source=("${_file_desktop}" "${_file_mime}")
-source_i686=("hib://${_file_zip_i686}")
-source_x86_64=("hib://${_file_zip_x86_64}")
-source_armv6h=("hib://${_file_zip_arm}")
-source_armv7h=("hib://${_file_zip_arm}")
+source=("${pkgname}.desktop"
+        "${pkgname}.xml")
+source_i686=("file://${pkgname}_${pkgver}_i386.zip")
+source_x86_64=("file://${pkgname}_${pkgver}_amd64.zip")
+source_armv6h=("file://${_file_zip_arm}")
+source_armv7h=("file://${_file_zip_arm}")
 
-# Source files hash declaration (SHA-512)
 sha256sums=('272f33c38a74456a4d2597a6b1d0c6ee9695d0e47f31ce08018c24a78e62759e'
             '2776340602e7ad29898500c4b2162bb5dd7746b933fb443b551e25a751e375e7')
 sha256sums_i686=('3ddc7ae2fc67352cabda1935114403cc70f408f73d25faee5385d85faa071f2f')
@@ -38,78 +28,39 @@ sha256sums_x86_64=('a433059942d5a4275d879c718a7d7d1611068d65f9cf57782ffefb11d7e2
 sha256sums_armv6h=('56a1239373f1681104a76ca24a1b3534079707ed787cde5d948ed71c651ba59e')
 sha256sums_armv7h=('56a1239373f1681104a76ca24a1b3534079707ed787cde5d948ed71c651ba59e')
 
-# Gets the current zip used
-[ "${CARCH}" = "i686" ] && _platform="${_arch_i686}"
-[ "${CARCH}" = "x86_64" ] && _platform="${_arch_x86_64}"
-[ "${CARCH}" = "armv6h" ] && _platform="${_arch_arm}"
-[ "${CARCH}" = "armv7h" ] && _platform="${_arch_arm}"
 
-# Add a DLAGENTS for hib if it doesn't exist.
-# Borrowed from https://aur.archlinux.org/packages/worldofgoo/ PKGBUILD
-DLAGENTS+=("hib::/usr/bin/echo Could not find %u. Manually download it to \"$(pwd)\", or set up a hib:// DLAGENT in /etc/makepkg.conf")
-
-# Prepares sources for building
 prepare () {
   # Moves content of the subfolder named pico-8 to src root
-  if [ "${_platform}" = "${_arch_i686}" ]; then 
+  if [ $CARCH = "i686" ]; then 
     mv "./pico-8_i386/"* .
   else
     mv "./pico-8/"* .
   fi
 
-  # Changes licence and icon filenames in order to comply naming conventions
+  # Changes license and icon filenames to comply with naming conventions
   mv "license.txt" "LICENSE"
-  mv "lexaloffle-pico8.png" "pico-8.png"
+  mv "lexaloffle-pico8.png" "${pkgname}.png"
 }
 
-# Prepares files for the package creation
-package () {
-  # Creates variables storing target paths
-  local _target_licenses="/usr/share/licenses/${pkgname}"
-  local _target_opt="/opt/${pkgname}"
-  local _target_bin="/usr/bin"
-  local _target_mimepackages="/usr/share/mime/packages"
-  local _target_apps="/usr/share/applications"
-  local _target_icons="/usr/share/icons/hicolor/128x128/apps"
-
-  # Creates variables storing pkg paths
-  local _pkg_licenses="${pkgdir}/${_target_licenses}"
-  local _pkg_opt="${pkgdir}/${_target_opt}"
-  local _pkg_bin="${pkgdir}/${_target_bin}"
-  local _pkg_mimepackages="${pkgdir}/${_target_mimepackages}"
-  local _pkg_apps="${pkgdir}/${_target_apps}"
-  local _pkg_icons="${pkgdir}/${_target_icons}"
 
-  # Creates pkg directories
-  mkdir -p "${_pkg_licenses}"
-  mkdir -p "${_pkg_opt}"
-  mkdir -p "${_pkg_bin}"
-  mkdir -p "${_pkg_mimepackages}"
-  mkdir -p "${_pkg_apps}"
-  mkdir -p "${_pkg_icons}"
-
-  # Creates local variables storing filenames
-  local _pico8_license="LICENSE"
-  local _pico8_bin="pico8"
-  local _pico8_dyn="pico8_dyn"
-  local _pico8_dat="pico8.dat"
-  local _pico8_txt="pico-8_manual.txt"
-  local _pico8_icon="pico-8.png"
-  local _pico8_mime="${_file_mime}"
-  local _pico8_desktop="${_file_desktop}"
+package () {
+  local _name=pico8
+  local _opt="${pkgdir}/opt/${pkgname}"
+  local _share="${pkgdir}/usr/share"
 
   # Installs the extracted files
-  install -Dm644 "${_pico8_license}" "${_pkg_licenses}/${_pico8_license}"
-  install -Dm755 "${_pico8_bin}" "${_pkg_opt}/${_pico8_bin}"
-  install -Dm644 "${_pico8_dat}" "${_pkg_opt}/${_pico8_dat}"
-  if [ "${_platform}" != "${_arch_x86_64}" ]; then
-    install -Dm644 "${_pico8_dyn}" "${_pkg_opt}/${_pico8_dyn}"
+  install -Dm644 "LICENSE" "${_share}/licenses/${pkgname}/LICENSE"
+  install -Dm755 "${_name}" "${_opt}/${_name}"
+  install -Dm644 -t "${_opt}" "${_name}.dat" "${pkgname}_manual.txt"
+  if [ $CARCH != x86_64 ]; then
+    install -Dm644 "${_name}_dyn" "${_target}/${_name}_dyn"
   fi
-  install -Dm644 "${_pico8_txt}" "${_pkg_opt}/${_pico8_txt}"
-  install -Dm644 "${_pico8_mime}" "${_pkg_mimepackages}/${_pico8_mime}"
-  install -Dm644 "${_pico8_desktop}" "${_pkg_apps}/${_pico8_desktop}"
-  install -Dm644 "${_pico8_icon}" "${_pkg_icons}/${_pico8_icon}"
+  install -Dm644 "${pkgname}.xml" "${_share}/mime/packages/${pkgname}.xml"
+  install -Dm644 "${pkgname}.desktop" "${_share}/applications/${pkgname}.desktop"
+  install -Dm644 "${pkgname}.png" "${_share}/icons/hicolor/128x128/apps/${pkgname}.png"
 
   # Links the installed binary to /usr/bin
-  ln -s "${_target_opt}/${_pico8_bin}" "${_pkg_bin}/${_pico8_bin}"
+  local _bin="${pkgdir}/usr/bin"
+  mkdir -p "${_bin}"
+  ln -s "/opt/${pkgname}/${_name}" "${_bin}/${_name}"
 }