Decluttered PKGBUILD | Added contributor

1 files changed, 9 insertions, 23 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 9303f23..c0e892c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,21 +1,13 @@
 # Maintainer: jc_gargma <jc_gargma@iserlohn-fortress.net>
 # Maintainer (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Aqua-sama <aqua@iserlohn-fortress.net>
 # Contributor (Arch): Ionut Biru <ibiru@archlinux.org>
 # Contributor (Arch): Jakub Schmidtke <sjakub@gmail.com>
 
 pkgname=firefox
-majver=62
-minver=0
-#revver=0
-#bz2ver=${majver}_${minver}_${revver}
-bz2ver=${majver}_${minver}
-#pkgver=$majver.$minver.$revver
-pkgver=$majver.$minver
+pkgver=62.0
+bz2ver=$(echo $pkgver | sed 's/\./_/g')
 pkgrel=1
-#pkgname=firefox
-#pkgver=61.0.1
-#bz2ver=$(echo $pkgver | sed 's/\./_/g')
-#pkgrel=2
 pkgdesc="Standalone web browser from mozilla.org"
 arch=(x86_64)
 license=(MPL GPL LGPL)
@@ -39,7 +31,6 @@ sha256sums=('81fc299be89e6f34c09209e89cebacf47c5c86395f24026ee17ad3d53d9c626c'
             '28e5db73f04ce8794f68822deda5512c64f832e542ad58fb7e40cad9e4785664')
 
 prepare() {
-
   cd mozilla-release-FIREFOX_${bz2ver}_RELEASE
 
   cat >$srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/.mozconfig <<END
@@ -55,7 +46,7 @@ ac_add_options --enable-rust-simd
 # Branding
 ac_add_options --disable-official-branding
 ac_add_options --enable-update-channel=release
-ac_add_options --with-distribution-id=org.archlinux
+ac_add_options --with-distribution-id=org.artixlinux
 export MOZ_TELEMETRY_REPORTING=0
 export MOZ_ADDON_SIGNING=0
 export MOZ_REQUIRE_SIGNING=0
@@ -68,7 +59,6 @@ ac_add_options --with-system-jpeg
 ac_add_options --with-system-libvpx
 ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
-#ac_add_options --enable-system-hunspell
 ac_add_options --enable-system-sqlite
 ac_add_options --enable-system-ffi
 
@@ -103,11 +93,7 @@ END
 
 build() {
   cd mozilla-release-FIREFOX_${bz2ver}_RELEASE
-  mkdir $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/obj-x86_64-pc-linux-gnu
-  mkdir $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/obj-x86_64-pc-linux-gnu/dist
-  mkdir $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/obj-x86_64-pc-linux-gnu/dist/bin
-  mkdir $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/obj-x86_64-pc-linux-gnu/dist/bin/browser
-  mkdir $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/obj-x86_64-pc-linux-gnu/dist/bin/browser/features
+  mkdir --parents $srcdir/mozilla-release-FIREFOX_${bz2ver}_RELEASE/obj-x86_64-pc-linux-gnu/dist/bin/browser/features
 
   export MOZ_SOURCE_REPO="$_repo"
 
@@ -129,14 +115,14 @@ package() {
   _distini="$pkgdir/usr/lib/$pkgname/distribution/distribution.ini"
   install -Dm644 /dev/stdin "$_distini" <<END
 [Global]
-id=archlinux
+id=artixlinux
 version=1.0
-about=Mozilla Firefox for Arch Linux
+about=Mozilla Firefox for Artix Linux
 
 [Preferences]
-app.distributor=archlinux
+app.distributor=artixlinux
 app.distributor.channel=$pkgname
-app.partner.archlinux=archlinux
+app.partner.artixlinux=artixlinux
 END
 
   for i in 16 22 24 32 48 64 128 256; do