From 84410113c20f7614fcaa442723618b14352bdc4f Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Fri, 10 Jul 2020 08:40:23 +0000 Subject: Spelling error --- archinstall/__main__.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/archinstall/__main__.py b/archinstall/__main__.py index 04004674..d5869020 100644 --- a/archinstall/__main__.py +++ b/archinstall/__main__.py @@ -13,9 +13,8 @@ def find_examples(): return {os.path.basename(path): path for path in glob.glob(f'{examples}/*.py')} - if __name__ == '__main__': - if len(sys.argv) == 1: sys.arv.append('guided') + if len(sys.argv) == 1: sys.argv.append('guided') profile = sys.argv[1] library = find_examples() @@ -26,4 +25,4 @@ if __name__ == '__main__': spec = importlib.util.spec_from_file_location(library[f'{profile}.py'], library[f'{profile}.py']) imported_path = importlib.util.module_from_spec(spec) spec.loader.exec_module(imported_path) - sys.modules[library[f'{profile}.py']] = imported_path \ No newline at end of file + sys.modules[library[f'{profile}.py']] = imported_path -- cgit v1.2.3-70-g09d2 From cc0f1210ad0eefaa772a2c63effa5ff1c538e2a2 Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Fri, 10 Jul 2020 08:41:08 +0000 Subject: Added a PKGBUILD which requires a pre-built nuitka3 version. More on this later. --- PKGBUILD | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 PKGBUILD diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 00000000..e0f9c6c7 --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,26 @@ +# Maintainer: Anton Hvornum anton@hvornum.se +# Contributor: Anton Hvornum anton@hvornum.se +pkgname="archinstall" +pkgver="v2.0.3" +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}-${pkgver}.tar.gz") +#makedepends=('python>=3.8') + +package() { + cd "${pkgname}-${pkgver}" + + mkdir -p "${pkgdir}/var/lib/archinstall/" + mkdir -p "${pkgdir}/usr/bin" + + mv * "${pkgdir}/var/lib/archinstall/" + + echo '#!/bin/bash' > "${pkgdir}/usr/bin/archinstall" + echo '(cd /var/lib/archinstall && exec ./archinstall)' >> "${pkgdir}/usr/bin/archinstall" + chmod +x "${pkgdir}/var/lib/archinstall/archinstall" +} -- cgit v1.2.3-70-g09d2 From 2e0295d50160c6ffb953bb15dbabbfeca0d72fe3 Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Fri, 10 Jul 2020 08:46:00 +0000 Subject: Added a build script for my own sanity --- .gitignore | 9 +++++++++ make.sh | 14 ++++++++++++++ 2 files changed, 23 insertions(+) create mode 100755 make.sh diff --git a/.gitignore b/.gitignore index 51a48ec6..7720fd5b 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,12 @@ SAFETY_LOCK **/**dist **/**.egg* **/**.sh +**/**.egg-info/ +**/**build/ +**/**src/ +**/**pkg/ +**/**dist/ +**/**archinstall.build/ +**/**archinstall-v*/ +**/**.pkg.*.xz +**/**archinstall-*.tar.gz diff --git a/make.sh b/make.sh new file mode 100755 index 00000000..92559930 --- /dev/null +++ b/make.sh @@ -0,0 +1,14 @@ +#!/bin/bash +# Description: Crude build/maker script for PKGBUILD dependencies and stuff. + +rm -rf archinstall.egg-info/ build/ src/ pkg/ dist/ archinstall.build/ archinstall-v2.0.3/ *.pkg.*.xz archinstall-*.tar.gz + +python3 setup.py sdist bdist_wheel +nuitka3 --standalone --show-progress archinstall + +mv archinstall.dist archinstall-v2.0.3 +tar -czvf archinstall-v2.0.3.tar.gz archinstall-v2.0.3 +makepkg -f + +rm -rf archinstall.egg-info/ build/ dist/ src/ pkg/ archinstall.build/ archinstall-v2.0.3/ archinstall-*.tar.gz +echo 'python3 -m twine upload dist/*' -- cgit v1.2.3-70-g09d2 From 6ac2858816a0aad224c953cb70affcce6af5ea7f Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Fri, 10 Jul 2020 11:01:49 +0000 Subject: Fixed the build to include the examples in the right location. --- PKGBUILD | 2 ++ make.sh | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index e0f9c6c7..51959640 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -22,5 +22,7 @@ package() { echo '#!/bin/bash' > "${pkgdir}/usr/bin/archinstall" echo '(cd /var/lib/archinstall && exec ./archinstall)' >> "${pkgdir}/usr/bin/archinstall" + chmod +x "${pkgdir}/var/lib/archinstall/archinstall" + chmod +x "${pkgdir}/usr/bin/archinstall" } diff --git a/make.sh b/make.sh index 92559930..b79d52e5 100755 --- a/make.sh +++ b/make.sh @@ -3,12 +3,13 @@ rm -rf archinstall.egg-info/ build/ src/ pkg/ dist/ archinstall.build/ archinstall-v2.0.3/ *.pkg.*.xz archinstall-*.tar.gz -python3 setup.py sdist bdist_wheel nuitka3 --standalone --show-progress archinstall - +cp -r examples/ archinstall.dist/ mv archinstall.dist archinstall-v2.0.3 tar -czvf archinstall-v2.0.3.tar.gz archinstall-v2.0.3 makepkg -f -rm -rf archinstall.egg-info/ build/ dist/ src/ pkg/ archinstall.build/ archinstall-v2.0.3/ archinstall-*.tar.gz +python3 setup.py sdist bdist_wheel echo 'python3 -m twine upload dist/*' + +rm -rf archinstall.egg-info/ build/ dist/ src/ pkg/ archinstall.build/ archinstall-v2.0.3/ -- cgit v1.2.3-70-g09d2 From 45268df2e7954b4c86f11b88610d80a3400c92bd Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Fri, 10 Jul 2020 11:06:41 +0000 Subject: Added the arch to the build --- PKGBUILD | 4 ++-- make.sh | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 51959640..ac760a11 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -9,11 +9,11 @@ license=('GPLv3') provides=("${pkgname}") md5sums=('SKIP') arch=('x86_64') -source=("${pkgname}-${pkgver}.tar.gz") +source=("${pkgname}-${pkgver}-x86_64.tar.gz") #makedepends=('python>=3.8') package() { - cd "${pkgname}-${pkgver}" + cd "${pkgname}-${pkgver}-x86_64" mkdir -p "${pkgdir}/var/lib/archinstall/" mkdir -p "${pkgdir}/usr/bin" diff --git a/make.sh b/make.sh index b79d52e5..448e8c78 100755 --- a/make.sh +++ b/make.sh @@ -1,15 +1,15 @@ #!/bin/bash # Description: Crude build/maker script for PKGBUILD dependencies and stuff. -rm -rf archinstall.egg-info/ build/ src/ pkg/ dist/ archinstall.build/ archinstall-v2.0.3/ *.pkg.*.xz archinstall-*.tar.gz +rm -rf archinstall.egg-info/ build/ src/ pkg/ dist/ archinstall.build/ archinstall-v2.0.3-x86_64/ *.pkg.*.xz archinstall-*.tar.gz nuitka3 --standalone --show-progress archinstall cp -r examples/ archinstall.dist/ -mv archinstall.dist archinstall-v2.0.3 -tar -czvf archinstall-v2.0.3.tar.gz archinstall-v2.0.3 +mv archinstall.dist archinstall-v2.0.3-x86_64 +tar -czvf archinstall-v2.0.3.tar.gz archinstall-v2.0.3-x86_64 makepkg -f python3 setup.py sdist bdist_wheel echo 'python3 -m twine upload dist/*' -rm -rf archinstall.egg-info/ build/ dist/ src/ pkg/ archinstall.build/ archinstall-v2.0.3/ +rm -rf archinstall.egg-info/ build/ dist/ src/ pkg/ archinstall.build/ archinstall-v2.0.3-x86_64/ -- cgit v1.2.3-70-g09d2 From 1213e260df344e6b2d875ba6677900369ea1aece Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Fri, 10 Jul 2020 12:00:40 +0000 Subject: Added binary option. --- README.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 9849f413..3e06aef3 100644 --- a/README.md +++ b/README.md @@ -11,15 +11,16 @@ Pre-built ISO's can be found here which autostarts archinstall *(in a safe guide # Installation & Usage -## ~~Run on Live-CD (Binary)~~ - -Currently this method is not supported until v2.1.0, this due to the rework of the contextualized approach. +## Run as stand-alone binary on Live-CD # wget https://gzip.app/archinstall - # chmod +x archinstall; ./archinstall + # tar xvzf archinstall*.tar.gz + # cd archinstall-v2.0.3 + # chmod +x archinstall + # ./archinstall -~~This downloads and runs a "compiled" *(using nuitka3)* version of the project.
-It will ask fora disk and start a guided installation.~~ +This downloads and runs a *compiled (using nuitka3)* version of the project.
+It will ask fora disk and start a guided installation. ## Install Python on Live-CD and run manually: -- cgit v1.2.3-70-g09d2 From a7515e4a9899c2b94ad3960916bf81592f0945f4 Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Mon, 13 Jul 2020 13:47:24 +0200 Subject: Update README.md --- README.md | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3e06aef3..d6c5e401 100644 --- a/README.md +++ b/README.md @@ -13,8 +13,8 @@ Pre-built ISO's can be found here which autostarts archinstall *(in a safe guide ## Run as stand-alone binary on Live-CD - # wget https://gzip.app/archinstall - # tar xvzf archinstall*.tar.gz + # curl -L https://gzip.app/archinstall > archinstall.tar.gz + # tar xvzf archinstall.tar.gz # cd archinstall-v2.0.3 # chmod +x archinstall # ./archinstall @@ -22,6 +22,15 @@ Pre-built ISO's can be found here which autostarts archinstall *(in a safe guide This downloads and runs a *compiled (using nuitka3)* version of the project.
It will ask fora disk and start a guided installation. +## Install with `pacman` on Live-CD + + # curl -L https://gzip.app/archinstall.xz > archinstall.pkg.tar.xz + # pacman -U archinstall.pkg.tar.xz + # archinstall guided + +This requires that the RAM on your machine is sufficient for a installation *(tested on 1024MB of RAM)*.
+But this will utilize `pacman` to install the pre-compiled binary from above and place archinstall in `PATH`. + ## Install Python on Live-CD and run manually: # wget https://github.com/Torxed/archinstall/archive/v2.0.3.tar.gz -- cgit v1.2.3-70-g09d2