Fix for #61. Variable mix-matches should be fixed and tested now. There's also slightly better debug output to show where the issue is rather than just 'AttributeError'.

5 files changed, 7 insertions, 7 deletions

diff --git a/PKGBUILD/archinstall-bin/PKGBUILD b/PKGBUILD/archinstall-bin/PKGBUILD
index 9d78deb0..0ae56290 100644
--- a/PKGBUILD/archinstall-bin/PKGBUILD
+++ b/PKGBUILD/archinstall-bin/PKGBUILD
@@ -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"
diff --git a/PKGBUILD/archinstall/PKGBUILD b/PKGBUILD/archinstall/PKGBUILD
index 94f83172..f594d086 100644
--- a/PKGBUILD/archinstall/PKGBUILD
+++ b/PKGBUILD/archinstall/PKGBUILD
@@ -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"
diff --git a/PKGBUILD/python-archinstall/PKGBUILD b/PKGBUILD/python-archinstall/PKGBUILD
index 97c20fd9..3d7dec15 100644
--- a/PKGBUILD/python-archinstall/PKGBUILD
+++ b/PKGBUILD/python-archinstall/PKGBUILD
@@ -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"
diff --git a/VERSION b/VERSION
index 7e20819a..10c7426d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0.6rc15
\ No newline at end of file
+2.0.6rc16
\ No newline at end of file
diff --git a/examples/guided.py b/examples/guided.py
index b57d5e34..c0fcd97b 100644
--- a/examples/guided.py
+++ b/examples/guided.py
@@ -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)