RomanNum3ral
/
archinstall
mirror of https://github.com/archlinux/archinstall.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed variable issues and version bump

This commit is contained in:
Lord Anton Hvornum 2020-11-08 14:48:40 +01:00
parent 3598e0bfa2
commit 4046c5349a
5 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PKGBUILD/archinstall-bin/PKGBUILD
View File

@ -1,7 +1,7 @@
# Maintainer: Anton Hvornum anton@hvornum.se # Maintainer: Anton Hvornum anton@hvornum.se
# Contributor: Anton Hvornum anton@hvornum.se # Contributor: Anton Hvornum anton@hvornum.se
pkgname="archinstall-bin" pkgname="archinstall-bin"
pkgver="2.0.6rc7" pkgver="2.0.6rc8"
pkgdesc="Installs a pre-built binary of ${pkgname}" pkgdesc="Installs a pre-built binary of ${pkgname}"
pkgrel=1 pkgrel=1
url="https://github.com/Torxed/archinstall" url="https://github.com/Torxed/archinstall"

2
PKGBUILD/archinstall/PKGBUILD
View File

@ -1,7 +1,7 @@
# Maintainer: Anton Hvornum <anton@hvornum.se> # Maintainer: Anton Hvornum <anton@hvornum.se>
# Contributor: demostanis worlds <demostanis@protonmail.com> # Contributor: demostanis worlds <demostanis@protonmail.com>
pkgname="archinstall" pkgname="archinstall"
pkgver="2.0.6rc7" pkgver="2.0.6rc8"
pkgdesc="Installs launcher scripts for archinstall" pkgdesc="Installs launcher scripts for archinstall"
pkgrel=1 pkgrel=1
url="https://github.com/Torxed/archinstall" url="https://github.com/Torxed/archinstall"

2
PKGBUILD/python-archinstall/PKGBUILD
View File

@ -2,7 +2,7 @@
# Contributor: demostanis worlds <demostanis@protonmail.com> # Contributor: demostanis worlds <demostanis@protonmail.com>
pkgname="python-archinstall" pkgname="python-archinstall"
pkgver="2.0.6rc7" pkgver="2.0.6rc8"
pkgdesc="Installs ${pkgname} as a python library." pkgdesc="Installs ${pkgname} as a python library."
pkgrel=1 pkgrel=1
url="https://github.com/Torxed/archinstall" url="https://github.com/Torxed/archinstall"

2
VERSION
View File

@ -1 +1 @@
2.0.6rc7 2.0.6rc8

19
examples/guided.py
View File

@ -49,21 +49,21 @@ def perform_installation(device, boot_partition, language, mirrors):
installation.set_keyboard_language(language) installation.set_keyboard_language(language)
installation.add_bootloader() installation.add_bootloader()
if len(packages) and packages[0] != '': if len(archinstall.storage['_guided']['packages']) and archinstall.storage['_guided']['packages'][0] != '':
installation.add_additional_packages(packages) installation.add_additional_packages(archinstall.storage['_guided']['packages'])
if profile and len(profile.strip()): if archinstall.storage['_guided']['profile'] and len(archinstall.storage['_guided']['profile'].strip()):
installation.install_profile(profile) installation.install_profile(archinstall.storage['_guided']['profile'])
for user, password in users.items(): for user, password in archinstall.storage['_guided']['users'].items():
sudo = False sudo = False
if len(root_pw.strip()) == 0: if len(archinstall.storage['_guided_hidden']['root_pw'].strip()) == 0:
sudo = True sudo = True
installation.user_create(user, password, sudo=sudo) installation.user_create(user, password, sudo=sudo)
if root_pw: if archinstall.storage['_guided_hidden']['root_pw']:
installation.user_set_pw('root', root_pw) installation.user_set_pw('root', archinstall.storage['_guided_hidden']['root_pw'])
# Unmount and close previous runs (in case the installer is restarted) # Unmount and close previous runs (in case the installer is restarted)
archinstall.sys_command(f'umount -R /mnt', suppress_errors=True) archinstall.sys_command(f'umount -R /mnt', suppress_errors=True)
@ -81,6 +81,7 @@ archinstall.set_keyboard_language(keyboard_language)
# Create a storage structure for all our information. # Create a storage structure for all our information.
# We'll print this right before the user gets informed about the formatting timer. # We'll print this right before the user gets informed about the formatting timer.
archinstall.storage['_guided'] = {} archinstall.storage['_guided'] = {}
archinstall.storage['_guided_hidden'] = {} # This will simply be hidden from printouts and things.
# Set which region to download packages from during the installation # Set which region to download packages from during the installation
mirror_regions = archinstall.select_mirror_regions(archinstall.list_mirrors()) mirror_regions = archinstall.select_mirror_regions(archinstall.list_mirrors())
@ -108,6 +109,8 @@ while (root_pw := getpass.getpass(prompt='Enter root password (leave blank to le
if root_pw != root_pw_verification: if root_pw != root_pw_verification:
archinstall.log(' * Passwords did not match * ', bg='black', fg='red') archinstall.log(' * Passwords did not match * ', bg='black', fg='red')
continue continue
archinstall.storage['_guided_hidden']['root_pw'] = root_pw
break break
# Ask for additional users (super-user if root pw was not set) # Ask for additional users (super-user if root pw was not set)