1 files changed, 9 insertions, 44 deletions

diff --git a/archinstall/lib/profiles.py b/archinstall/lib/profiles.py
index ad5d3bac..06237c1c 100644
--- a/archinstall/lib/profiles.py
+++ b/archinstall/lib/profiles.py
@@ -92,6 +92,9 @@ class Script():
 		if len(args) >= 2 and args[1]:
 			raise args[1]
 
+		if self.original_namespace:
+			self.namespace = self.original_namespace
+
 	def localize_path(self, profile_path):
 		if (url := urllib.parse.urlparse(profile_path)).scheme and url.scheme in ('https', 'http'):
 			if not self.converted_path:
@@ -202,51 +205,14 @@ class Profile(Script):
 		with open(self.path, 'r') as source:
 			source_data = source.read()
 
-			# TODO: I imagine that there is probably a better way to write this.
-			return 'top_level_profile = True' in source_data
-
-	@property
-	def packages(self) -> list:
-		"""
-		Returns a list of packages baked into the profile definition.
-		If no package definition has been done, .packages() will return None.
-		"""
-		with open(self.path, 'r') as source:
-			source_data = source.read()
-
-			# Some crude safety checks, make sure the imported profile has
-			# a __name__ check before importing.
-			#
-			# If the requirements are met, import with .py in the namespace to not
-			# trigger a traditional:
-			#     if __name__ == 'moduleName'
-			if '__name__' in source_data and '__packages__' in source_data:
-				with self.load_instructions(namespace=f"{self.namespace}.py") as imported:
-					if hasattr(imported, '__packages__'):
-						return imported.__packages__
-		return None
-	
-
-	def has_post_install(self):
-		with open(self.path, 'r') as source:
-			source_data = source.read()
-
-			# Some crude safety checks, make sure the imported profile has
-			# a __name__ check and if so, check if it's got a _prep_function()
-			# we can call to ask for more user input.
-			#
-			# If the requirements are met, import with .py in the namespace to not
-			# trigger a traditional:
-			#     if __name__ == 'moduleName'
-			if '__name__' in source_data and '_post_install' in source_data:
+			if '__name__' in source_data and 'is_top_level_profile' in source_data:
 				with self.load_instructions(namespace=f"{self.namespace}.py") as imported:
-					if hasattr(imported, '_post_install'):
-						return True
+					if hasattr(imported, 'is_top_level_profile'):
+						return imported.is_top_level_profile
 
-	def is_top_level_profile(self):
-		with open(self.path, 'r') as source:
-			source_data = source.read()
-			return 'top_level_profile = True' in source_data
+		# Default to True if nothing is specified,
+		# since developers like less code - omitting it should assume they want to present it.
+		return True
 
 	@property
 	def packages(self) -> list:
@@ -268,7 +234,6 @@ class Profile(Script):
 					if hasattr(imported, '__packages__'):
 						return imported.__packages__
 		return None
-	
 
 class Application(Profile):
 	def __repr__(self, *args, **kwargs):