From 8d941eaa2c3a8d18163543d81c8589884fdc7cd1 Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Thu, 1 Oct 2020 10:33:14 +0200 Subject: Renamed the pre-compiled PKGBUILD profile to archinstall-bin. Also added archinstall which is helper-scripts to run archinstall in python-module mode which depends on python-archinstall. Version bump to 2.0.5 --- PKGBUILD/archinstall-bin/PKGBUILD | 37 +++++++++++++++++++++++++++++++++++ PKGBUILD/archinstall/PKGBUILD | 38 +++++++++++++++--------------------- PKGBUILD/python-archinstall/PKGBUILD | 2 +- README.md | 8 ++++---- VERSION | 2 +- 5 files changed, 59 insertions(+), 28 deletions(-) create mode 100644 PKGBUILD/archinstall-bin/PKGBUILD diff --git a/PKGBUILD/archinstall-bin/PKGBUILD b/PKGBUILD/archinstall-bin/PKGBUILD new file mode 100644 index 00000000..178d03e2 --- /dev/null +++ b/PKGBUILD/archinstall-bin/PKGBUILD @@ -0,0 +1,37 @@ +# Maintainer: Anton Hvornum anton@hvornum.se +# Contributor: Anton Hvornum anton@hvornum.se +pkgname="archinstall-bin" +pkgver="2.0.5" +pkgdesc="Installs a pre-built binary of ${pkgname}" +pkgrel=1 +url="https://github.com/Torxed/archinstall" +license=('GPLv3') +provides=("${pkgname}") +md5sums=('SKIP') +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') + +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 index aeb0032e..51ae83ea 100644 --- a/PKGBUILD/archinstall/PKGBUILD +++ b/PKGBUILD/archinstall/PKGBUILD @@ -1,38 +1,32 @@ # Maintainer: Anton Hvornum anton@hvornum.se # Contributor: Anton Hvornum anton@hvornum.se pkgname="archinstall" -pkgver="2.0.4" -pkgdesc="Installs a pre-built binary of ${pkgname}" +pkgver="2.0.5" +pkgdesc="Installs launcher scripts for archinstall" pkgrel=1 url="https://github.com/Torxed/archinstall" license=('GPLv3') provides=("${pkgname}") md5sums=('SKIP') 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=('python>=3.8: Installs archinstall as a python library (same as pip install --upgrade archinstall)') - -build() { - cd "${pkgname}-${pkgver}" - - nuitka3 --standalone --show-progress archinstall - cp -r examples/ archinstall.dist/ -} +depends=('python-archinstall') package() { - echo "${srcdir}" - cd "${pkgname}-${pkgver}" - - mkdir -p "${pkgdir}/var/lib/archinstall/" mkdir -p "${pkgdir}/usr/bin" - mv archinstall.dist/* "${pkgdir}/var/lib/archinstall/" + # Install a guided profile + echo '#!/bin/bash' > "${pkgdir}/usr/bin/archinstall-guided" + echo 'python -m archinstall guided' >> "${pkgdir}/usr/bin/archinstall-guided" + + # Install a minimal profile + echo '#!/bin/bash' > "${pkgdir}/usr/bin/archinstall-minimal" + echo 'python -m archinstall minimal' >> "${pkgdir}/usr/bin/archinstall-minimal" - echo '#!/bin/bash' > "${pkgdir}/usr/bin/archinstall" - echo '(cd /var/lib/archinstall && exec ./archinstall)' >> "${pkgdir}/usr/bin/archinstall" + # Install a unattended profile (safely aborts if no machine specific instructions are found) + #echo '#!/bin/bash' > "${pkgdir}/usr/bin/archinstall-unattended" + #echo 'python -m archinstall unattended' >> "${pkgdir}/usr/bin/archinstall-unattended" - chmod +x "${pkgdir}/var/lib/archinstall/archinstall" - chmod +x "${pkgdir}/usr/bin/archinstall" + chmod +x "${pkgdir}/usr/bin/archinstall-guided" + chmod +x "${pkgdir}/usr/bin/archinstall-minimal" + #chmod +x "${pkgdir}/usr/bin/archinstall-unattended" } diff --git a/PKGBUILD/python-archinstall/PKGBUILD b/PKGBUILD/python-archinstall/PKGBUILD index ff6935df..ccf8f683 100644 --- a/PKGBUILD/python-archinstall/PKGBUILD +++ b/PKGBUILD/python-archinstall/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Anton Hvornum anton@hvornum.se # Contributor: Anton Hvornum anton@hvornum.se pkgname="python-archinstall" -pkgver="2.0.4" +pkgver="2.0.5" pkgdesc="Installs ${pkgname} as a python library." pkgrel=1 url="https://github.com/Torxed/archinstall" diff --git a/README.md b/README.md index 868cad67..66aa5b76 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ Pre-built ISO's can be found over at https://archlinux.life which autostarts arc # curl -L https://archlinux.life/bin/archinstall > archinstall.tar.gz # tar xvzf archinstall.tar.gz - # cd archinstall-v2.0.4 + # cd archinstall-v2.0.5 # chmod +x archinstall # ./archinstall @@ -33,9 +33,9 @@ But this will utilize `pacman` to install the pre-compiled binary from above and ## Install Python on Live-CD and run manually: - # wget https://github.com/Torxed/archinstall/archive/v2.0.4.tar.gz - # tar xvzf v2.0.4.tar.gz - # cd archinstall-2.0.4 + # wget https://github.com/Torxed/archinstall/archive/v2.0.5.tar.gz + # tar xvzf v2.0.5.tar.gz + # cd archinstall-2.0.5 # pacman -S --noconfirm python pip python examples/guided.py diff --git a/VERSION b/VERSION index 26e33797..b9d2bdfd 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.4 \ No newline at end of file +2.0.5 \ No newline at end of file -- cgit v1.2.3-54-g00ecf