From 76c386951a802abd814f88aa9d67109275244a5c Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Tue, 18 Aug 2020 21:54:34 +0000 Subject: Added build support for PKGBUILD. Also slimmed down make.sh to only compile the binary and nothing more. That way it's easier to ship the build to https://archlinux.life/bin/. Updated README to reflext the archlinux.life domain instead of hvornum.se since projects regarding archlinux will reside there or elsewhere in the future. --- PKGBUILD | 19 ++++++++++++++----- README.md | 14 +++++++------- make.sh | 18 ++++++++++-------- 3 files changed, 31 insertions(+), 20 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index d54e0dc3..702575f9 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Anton Hvornum anton@hvornum.se # Contributor: Anton Hvornum anton@hvornum.se pkgname="archinstall" -pkgver="v2.0.4rc3" +pkgver="2.0.4rc4" pkgdesc="Installs a pre-built binary of ${pkgname}" pkgrel=1 url="https://github.com/Torxed/archinstall" @@ -9,16 +9,25 @@ license=('GPLv3') provides=("${pkgname}") md5sums=('SKIP') arch=('x86_64') -source=("${pkgname}-${pkgver}-x86_64.tar.gz") -#makedepends=('python>=3.8') +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() { - cd "${pkgname}-${pkgver}-x86_64" + echo "${srcdir}" + cd "${pkgname}-${pkgver}" mkdir -p "${pkgdir}/var/lib/archinstall/" mkdir -p "${pkgdir}/usr/bin" - mv * "${pkgdir}/var/lib/archinstall/" + mv archinstall.dist/* "${pkgdir}/var/lib/archinstall/" echo '#!/bin/bash' > "${pkgdir}/usr/bin/archinstall" echo '(cd /var/lib/archinstall && exec ./archinstall)' >> "${pkgdir}/usr/bin/archinstall" diff --git a/README.md b/README.md index d6c5e401..206f55c2 100644 --- a/README.md +++ b/README.md @@ -2,20 +2,20 @@ Just another guided/automated [Arch Linux](https://wiki.archlinux.org/index.php/Arch_Linux) installer with a twist. The installer also doubles as a python library to access each individual installation step for customized installs. -Pre-built ISO's can be found here which autostarts archinstall *(in a safe guided mode)*: https://hvornum.se/archiso/ +Pre-built ISO's can be found here which autostarts archinstall *(in a safe guided mode)*: https://archlinux.life/ * archinstall [discord](https://discord.gg/cqXU88y) server * ~~archinstall [documentation](#)~~ *(TBA)* - * archinstall ISO's: https://hvornum.se/archiso/ + * archinstall ISO's: https://archlinux.life/ * archinstall on [#archinstall@freenode (IRC)](irc://#archinstall@FreeNode) # Installation & Usage ## Run as stand-alone binary on Live-CD - # curl -L https://gzip.app/archinstall > archinstall.tar.gz + # curl -L https://archlinux.life/bin/archinstall > archinstall.tar.gz # tar xvzf archinstall.tar.gz - # cd archinstall-v2.0.3 + # cd archinstall-v2.0.4 # 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.3.tar.gz - # tar xvzf v2.0.2.tar.gz - # cd archinstall-2.0.2 + # wget https://github.com/Torxed/archinstall/archive/v2.0.4.tar.gz + # tar xvzf v2.0.4.tar.gz + # cd archinstall-2.0.4 # pacman -S --noconfirm python; python examples/guided.py This will ask for a disk and start a guided installation. diff --git a/make.sh b/make.sh index e369209a..30e622f8 100755 --- a/make.sh +++ b/make.sh @@ -1,15 +1,17 @@ #!/bin/bash -# Description: Crude build/maker script for PKGBUILD dependencies and stuff. +# Description: Binary builder for https://archlinux.life/bin/ -rm -rf archinstall.egg-info/ build/ src/ pkg/ dist/ archinstall.build/ archinstall-v2.0.4rc3-x86_64/ *.pkg.*.xz archinstall-*.tar.gz +VERSION="2.0.4rc4" + +rm -rf archinstall.egg-info/ build/ src/ pkg/ dist/ archinstall.build/ "archinstall-v${VERSION}-x86_64/" *.pkg.*.xz archinstall-*.tar.gz nuitka3 --standalone --show-progress archinstall cp -r examples/ archinstall.dist/ -mv archinstall.dist archinstall-v2.0.4rc3-x86_64 -tar -czvf archinstall-v2.0.4rc3.tar.gz archinstall-v2.0.4rc3-x86_64 -makepkg -f +mv archinstall.dist "archinstall-v${VERSION}-x86_64" +tar -czvf "archinstall-v${VERSION}.tar.gz" "archinstall-v${VERSION}-x86_64" -python3 setup.py sdist bdist_wheel -echo 'python3 -m twine upload dist/*; rm -rf dist/' +# makepkg -f +# python3 setup.py sdist bdist_wheel +# echo 'python3 -m twine upload dist/*; rm -rf dist/' -rm -rf archinstall.egg-info/ build/ src/ pkg/ archinstall.build/ archinstall-v2.0.4rc3-x86_64/ +rm -rf archinstall.egg-info/ build/ src/ pkg/ archinstall.build/ "archinstall-v${VERSION}-x86_64/" -- cgit v1.2.3-70-g09d2