Merge branch 'master' of github.com:Torxed/archinstall

This commit is contained in:
Anton Hvornum 2020-07-21 08:18:06 +02:00
commit e438e1bbde
5 changed files with 70 additions and 9 deletions

9
.gitignore vendored
View File

@ -7,3 +7,12 @@ SAFETY_LOCK
**/**dist
**/**.egg*
**/**.sh
**/**.egg-info/
**/**build/
**/**src/
**/**pkg/
**/**dist/
**/**archinstall.build/
**/**archinstall-v*/
**/**.pkg.*.xz
**/**archinstall-*.tar.gz

28
PKGBUILD Normal file
View File

@ -0,0 +1,28 @@
# 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}-x86_64.tar.gz")
#makedepends=('python>=3.8')
package() {
cd "${pkgname}-${pkgver}-x86_64"
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"
chmod +x "${pkgdir}/usr/bin/archinstall"
}

View File

@ -11,15 +11,25 @@ Pre-built ISO's can be found here which autostarts archinstall *(in a safe guide
# Installation & Usage
## ~~Run on Live-CD (Binary)~~
## Run as stand-alone binary on Live-CD
Currently this method is not supported until v2.1.0, this due to the rework of the contextualized approach.
# curl -L https://gzip.app/archinstall > archinstall.tar.gz
# tar xvzf archinstall.tar.gz
# cd archinstall-v2.0.3
# chmod +x archinstall
# ./archinstall
# wget https://gzip.app/archinstall
# chmod +x archinstall; ./archinstall
This downloads and runs a *compiled (using nuitka3)* version of the project.<br>
It will ask fora disk and start a guided installation.
~~This downloads and runs a "compiled" *(using nuitka3)* version of the project.<br>
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)*.<br>
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:

View File

@ -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
sys.modules[library[f'{profile}.py']] = imported_path

15
make.sh Executable file
View File

@ -0,0 +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-x86_64/ *.pkg.*.xz archinstall-*.tar.gz
nuitka3 --standalone --show-progress archinstall
cp -r examples/ archinstall.dist/
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-x86_64/