Merge branch 'master' into enlightenment

3 files changed, 8 insertions, 4 deletions

diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py
index 03b49f77..68d058f0 100644
--- a/archinstall/lib/installer.py
+++ b/archinstall/lib/installer.py
@@ -320,12 +320,9 @@ class Installer():
 				if 'encrypt' not in self.HOOKS:
 					self.HOOKS.insert(self.HOOKS.index('filesystems'), 'encrypt')
 
-		if not(hasUEFI()): # TODO: Allow for grub even on EFI
+		if not(hasUEFI()):
 			self.base_packages.append('grub')
 										
-		self.pacstrap(self.base_packages)
-		self.helper_flags['base-strapped'] = True
-		#self.genfstab()
 		if not isVM():
 			vendor = cpuVendor()
 			if vendor ==  "AuthenticAMD":
@@ -334,6 +331,10 @@ class Installer():
 				self.base_packages.append("intel-ucode")
 			else:
 				self.log("Unknown cpu vendor not installing ucode")
+					
+		self.pacstrap(self.base_packages)
+		self.helper_flags['base-strapped'] = True
+
 		with open(f"{self.target}/etc/fstab", "a") as fstab:
 			fstab.write(
 				"\ntmpfs /tmp tmpfs defaults,noatime,mode=1777 0 0\n"
diff --git a/archinstall/lib/profiles.py b/archinstall/lib/profiles.py
index 9225a129..42fd4c24 100644
--- a/archinstall/lib/profiles.py
+++ b/archinstall/lib/profiles.py
@@ -26,6 +26,8 @@ def list_profiles(filter_irrelevant_macs=True, subpath='', filter_top_level_prof
 	for PATH_ITEM in storage['PROFILE_PATH']:
 		for root, folders, files in os.walk(os.path.abspath(os.path.expanduser(PATH_ITEM+subpath))):
 			for file in files:
+				if file == '__init__.py':
+					continue
 				if os.path.splitext(file)[1] == '.py':
 					tailored = False
 					if len(mac := re.findall('(([a-zA-z0-9]{2}[-:]){5}([a-zA-z0-9]{2}))', file)):
diff --git a/profiles/desktop.py b/profiles/desktop.py
index cdd23ba0..9e1d8b4c 100644
--- a/profiles/desktop.py
+++ b/profiles/desktop.py
@@ -17,6 +17,7 @@ def _prep_function(*args, **kwargs):
 	"""
 
 	supported_desktops = ['gnome', 'kde', 'awesome', 'sway', 'cinnamon', 'xfce4', 'lxqt', 'i3', 'budgie', 'mate', 'deepin', 'enlightenment']
+
 	desktop = archinstall.generic_select(supported_desktops, 'Select your desired desktop environment: ',
 										 allow_empty_input=False, sort=True)