From db4659a3eb32efefc14a073fc9049d2cf3a551d6 Mon Sep 17 00:00:00 2001
From: Giancarlo Razzolini <grazzolini@archlinux.org>
Date: Mon, 25 Jan 2021 12:06:24 -0300
Subject: Move PKGBUILD dir to PKGBUILDs dir and create a new PKGBUILD for git

Create a new PKGBUILD that builds from the current git directory for ease of
testing. Moved the PKGBUILD directory to PKGBUILDs.
---
 PKGBUILD                             | 44 ++++++++++++++++++++++++++++++++++++
 PKGBUILD/archinstall-bin/PKGBUILD    | 38 -------------------------------
 PKGBUILD/archinstall/PKGBUILD        | 29 ------------------------
 PKGBUILD/python-archinstall/PKGBUILD | 34 ----------------------------
 4 files changed, 44 insertions(+), 101 deletions(-)
 create mode 100644 PKGBUILD
 delete mode 100644 PKGBUILD/archinstall-bin/PKGBUILD
 delete mode 100644 PKGBUILD/archinstall/PKGBUILD
 delete mode 100644 PKGBUILD/python-archinstall/PKGBUILD

(limited to 'PKGBUILD')

diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 00000000..7e073666
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,44 @@
+# Maintainer: Anton Hvornum <anton@hvornum.se>
+# Contributor: Giancarlo Razzolini <grazzolini@archlinux.org>
+# Contributor: demostanis worlds <demostanis@protonmail.com>
+
+pkgbase=archinstall-git
+pkgname=('archinstall-git' 'python-archinstall-git')
+pkgver=$(git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g')
+pkgrel=1
+pkgdesc="Just another guided/automated Arch Linux installer with a twist"
+arch=('any')
+url="https://github.com/Torxed/archinstall"
+license=('GPL')
+depends=('python')
+makedepends=('python-setuptools')
+
+build() {
+	cd "$startdir"
+
+        python setup.py build
+}
+
+
+package_archinstall-git() {
+        depends=('python-archinstall-git')
+        conflicts=('archinstall')
+	cd "$startdir"
+
+        mkdir -p "${pkgdir}/usr/bin"
+        
+        # Install a guided profile
+	cat - > "${pkgdir}/usr/bin/archinstall" <<EOF
+#!/bin/sh
+python -m archinstall $@
+EOF
+
+	chmod +x "${pkgdir}/usr/bin/archinstall"
+}
+
+package_python-archinstall-git() {
+        conflicts=('python-archinstall')
+	cd "$startdir"
+
+        python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build
+}
diff --git a/PKGBUILD/archinstall-bin/PKGBUILD b/PKGBUILD/archinstall-bin/PKGBUILD
deleted file mode 100644
index cf6c1a9c..00000000
--- a/PKGBUILD/archinstall-bin/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Anton Hvornum anton@hvornum.se
-# Contributor: Anton Hvornum anton@hvornum.se
-pkgname="archinstall-bin"
-pkgver="2.1.0"
-pkgdesc="Installs a pre-built binary of ${pkgname}"
-pkgrel=1
-url="https://github.com/Torxed/archinstall"
-license=('GPLv3')
-provides=("${pkgname}")
-arch=('x86_64')
-source=("${pkgname}-v${pkgver}-x86_64.tar.gz::https://github.com/Torxed/archinstall/archive/v$pkgver.tar.gz")
-#depends=('python>=3.8')
-makedepends=('python>=3.8' 'nuitka')
-optdepends=('pyttsx3: Adds text-to-speach support for log/screen output.')
-sha256sums=('4f8221158808228833e052260590e7ecf2733de108ada134cdde6d40ab45526b')
-
-build() {
-	cd "${pkgname}-${pkgver}"
-
-	nuitka3 --standalone --show-progress archinstall
-	cp -r examples/ archinstall.dist/
-}
- 
-package() {
-	echo "${srcdir}"
-	cd "${pkgname}-${pkgver}"
-
-	mkdir -p "${pkgdir}/var/lib/archinstall/"
-	mkdir -p "${pkgdir}/usr/bin"
-
-	mv archinstall.dist/* "${pkgdir}/var/lib/archinstall/"
-
-	echo '#!/bin/bash' > "${pkgdir}/usr/bin/archinstall-bin"
-	echo '(cd /var/lib/archinstall && exec ./archinstall)' >> "${pkgdir}/usr/bin/archinstall-bin"
-
-	chmod +x "${pkgdir}/var/lib/archinstall/archinstall"
-	chmod +x "${pkgdir}/usr/bin/archinstall-bin"
-}
diff --git a/PKGBUILD/archinstall/PKGBUILD b/PKGBUILD/archinstall/PKGBUILD
deleted file mode 100644
index d76fe7cf..00000000
--- a/PKGBUILD/archinstall/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Maintainer: Anton Hvornum <anton@hvornum.se>
-# Contributor: demostanis worlds <demostanis@protonmail.com>
-pkgname="archinstall"
-pkgver="2.1.0"
-pkgdesc="Installs launcher scripts for archinstall"
-pkgrel=1
-url="https://github.com/Torxed/archinstall"
-license=('GPLv3')
-provides=("${pkgname}")
-arch=('x86_64')
-source=("${pkgname}-v${pkgver}-x86_64.tar.gz::https://github.com/Torxed/archinstall/archive/v$pkgver.tar.gz")
-depends=('python-archinstall')
-sha256sums=('4f8221158808228833e052260590e7ecf2733de108ada134cdde6d40ab45526b')
-
-package() {
-	mkdir -p "${pkgdir}/usr/bin"
-
-	# Install a guided profile
-	cat - > "${pkgdir}/usr/bin/archinstall" <<EOF
-#!/bin/sh
-
-python -m archinstall $@
-EOF
-
-	chmod +x "${pkgdir}/usr/bin/archinstall"
-}
-
-# vim:ft=sh
-
diff --git a/PKGBUILD/python-archinstall/PKGBUILD b/PKGBUILD/python-archinstall/PKGBUILD
deleted file mode 100644
index 83b174fc..00000000
--- a/PKGBUILD/python-archinstall/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# Maintainer: Anton Hvornum <anton@hvornum.se>
-# Contributor: demostanis worlds <demostanis@protonmail.com>
-
-pkgname="python-archinstall"
-pkgver="2.1.0"
-pkgdesc="Installs ${pkgname} as a python library."
-pkgrel=1
-url="https://github.com/Torxed/archinstall"
-source=("${pkgname}-v${pkgver}-x86_64.tar.gz::https://github.com/Torxed/archinstall/archive/v$pkgver.tar.gz")
-license=('GPLv3')
-provides=("${pkgname}")
-arch=('x86_64')
-depends=('python>=3.8')
-makedepends=('python-setuptools')
-optdepends=('pyttsx3: Adds text-to-speech support for log/screen output.')
-sha256sums=('4f8221158808228833e052260590e7ecf2733de108ada134cdde6d40ab45526b')
-
-build() {
-	cd "archinstall-${pkgver}"
-
-	python setup.py build
-}
- 
-package() {
-	cd "archinstall-${pkgver}"
-
-	python setup.py install \
-		--prefix=/usr \
-		--root="${pkgdir}" \
-		--optimize=1
-}
-
-# vim:ft=sh
-
-- 
cgit v1.2.3-70-g09d2