Skip to content

Commit

Permalink
Fix for #61. Variable mix-matches should be fixed and tested now. The…
Browse files Browse the repository at this point in the history
…re's also slightly better debug output to show where the issue is rather than just 'AttributeError'.
  • Loading branch information
Torxed committed Nov 8, 2020
1 parent decf911 commit e43a84b
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion PKGBUILD/archinstall-bin/PKGBUILD
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Maintainer: Anton Hvornum anton@hvornum.se
# Contributor: Anton Hvornum anton@hvornum.se
pkgname="archinstall-bin"
pkgver="2.0.6rc15"
pkgver="2.0.6rc16"
pkgdesc="Installs a pre-built binary of ${pkgname}"
pkgrel=1
url="https://github.com/Torxed/archinstall"
Expand Down
2 changes: 1 addition & 1 deletion PKGBUILD/archinstall/PKGBUILD
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Maintainer: Anton Hvornum <anton@hvornum.se>
# Contributor: demostanis worlds <demostanis@protonmail.com>
pkgname="archinstall"
pkgver="2.0.6rc15"
pkgver="2.0.6rc16"
pkgdesc="Installs launcher scripts for archinstall"
pkgrel=1
url="https://github.com/Torxed/archinstall"
Expand Down
2 changes: 1 addition & 1 deletion PKGBUILD/python-archinstall/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Contributor: demostanis worlds <demostanis@protonmail.com>

pkgname="python-archinstall"
pkgver="2.0.6rc15"
pkgver="2.0.6rc16"
pkgdesc="Installs ${pkgname} as a python library."
pkgrel=1
url="https://github.com/Torxed/archinstall"
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.0.6rc15
2.0.6rc16
6 changes: 3 additions & 3 deletions examples/guided.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,14 @@ def perform_installation(device, boot_partition, language, mirrors):

for user in archinstall.storage['_guided']['users']:
password = users[user]

sudo = False
if len(archinstall.storage['_guided_hidden']['root_pw'].strip()) == 0:
if 'root_pw' not in archinstall.storage['_guided_hidden'] or len(archinstall.storage['_guided_hidden']['root_pw'].strip()) == 0:
sudo = True

installation.user_create(user, password, sudo=sudo)

if archinstall.storage['_guided_hidden']['root_pw']:
if 'root_pw' in archinstall.storage['_guided_hidden'] and archinstall.storage['_guided_hidden']['root_pw']:
installation.user_set_pw('root', archinstall.storage['_guided_hidden']['root_pw'])

# Unmount and close previous runs (in case the installer is restarted)
Expand Down

0 comments on commit e43a84b

Please sign in to comment.