[arch-commits] Commit in archinstall/trunk (PKGBUILD)

[Giancarlo Razzolini via arch-commits]

    Date: Monday, April 26, 2021 @ 11:21:31
  Author: grazzolini
Revision: 413876

upgpkg: archinstall 2.1.4-1

Modified:
  archinstall/trunk/PKGBUILD

----------+
 PKGBUILD |   38 ++++++++++++--------------------------
 1 file changed, 12 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2021-04-26 09:45:19 UTC (rev 413875)
+++ PKGBUILD    2021-04-26 11:21:31 UTC (rev 413876)
@@ -2,9 +2,8 @@
 # Contributor: Anton Hvornum <an...@hvornum.se>
 # Contributor: demostanis worlds <demosta...@protonmail.com>
 
-pkgbase=archinstall
-pkgname=('archinstall' 'python-archinstall')
-pkgver=2.1.3
+pkgname=archinstall
+pkgver=2.1.4
 pkgrel=1
 pkgdesc="Just another guided/automated Arch Linux installer with a twist"
 arch=('any')
@@ -12,17 +11,19 @@
 license=('GPL')
 depends=('python')
 makedepends=('python-pip' 'python-setuptools' 'python-sphinx')
-source=("$pkgbase-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz"
-        "$url/releases/download/v$pkgver/$pkgbase-$pkgver.tar.gz.asc")
-md5sums=('3ef628d005a74c1e8004bcde87b034b6'
+provides=('python-archinstall')
+conflicts=('python-archinstall')
+source=("$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz"
+        "$url/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz.asc")
+md5sums=('b5846e2a8aacfbba2ccc00643a9bb1f7'
          'SKIP')
-sha512sums=('f37aa483c29f71c44135d3ff2a910ae101d8be5e70e4ed6af2038d41df2301d43ec9d1024ce1cab23a58828e279f1c8256ea9ece7ca98eb04f0719c6ec941399'
+sha512sums=('8d5c573aace6ffe1716121ae2417170db5330cd9b2f458a6454ccb12d1c946dd25452f349bd5e9a8f3f1d21ed55ffe1b82311db44bdf20a6579a89248ffa383c'
             'SKIP')
 validpgpkeys=('256F73CEEFC6705C6BBAB20E5FBBB32941E3740A') # Anton Hvornum 
(Torxed) <an...@hvornum.se>
 
 
 build() {
-       cd "$pkgbase-$pkgver"
+       cd "$pkgname-$pkgver"
 
         python setup.py build
 
@@ -31,25 +32,10 @@
 }
 
 
-package_archinstall() {
-        depends=('python-archinstall')
-       cd "$pkgbase-$pkgver"
+package() {
+       cd "$pkgname-$pkgver"
 
-        mkdir -p "${pkgdir}/usr/bin"
-        
-        # Install a guided profile
-       cat - > "${pkgdir}/usr/bin/archinstall" <<EOF
-#!/bin/sh
-python -m archinstall $@
-EOF
+        python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 
--skip-build
 
-       chmod +x "${pkgdir}/usr/bin/archinstall"
-
         install -Dm644 docs/_build/man/archinstall.1 
"${pkgdir}"/usr/share/man/man1/archinstall.1
 }
-
-package_python-archinstall() {
-       cd "$pkgbase-$pkgver"
-
-        python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 
--skip-build
-}