Use main() as script entrypoint

Author: codefiles

archinstall/main.py

@@ -83,7 +83,9 @@ def run() -> int:
 		arch_config_handler.print_help()
 		return 0
 
-	if arch_config_handler.get_script() == 'list':
+	script = arch_config_handler.get_script()
+
+	if script == 'list':
 		print(_list_scripts())
 		return 0
 
@@ -119,11 +121,10 @@ def run() -> int:
 	else:
 		debug('Running from ISO (Live Mode)...')
 
-	script = arch_config_handler.get_script()
-
 	mod_name = f'archinstall.scripts.{script}'
 	# by loading the module we'll automatically run the script
-	importlib.import_module(mod_name)
+	module = importlib.import_module(mod_name)
+	module.main()
 
 	return 0
 

archinstall/scripts/guided.py

@@ -190,7 +190,7 @@ def perform_installation(
 						pass
 
 
-def guided() -> None:
+def main() -> None:
 	mirror_list_handler = MirrorListHandler(
 		offline=arch_config_handler.args.offline,
 		verbose=arch_config_handler.args.verbose,
@@ -213,7 +213,7 @@ def guided() -> None:
 			aborted = True
 
 		if aborted:
-			return guided()
+			return main()
 
 	if arch_config_handler.config.disk_config:
 		fs_handler = FilesystemHandler(arch_config_handler.config.disk_config)
@@ -227,4 +227,5 @@ def guided() -> None:
 	)
 
 
-guided()
+if __name__ == '__main__':
+	main()

archinstall/scripts/minimal.py

@@ -58,7 +58,7 @@ def perform_installation(mountpoint: Path) -> None:
 	info(' * devel (password: devel)')
 
 
-def _minimal() -> None:
+def main() -> None:
 	disk_config = DiskLayoutConfigurationMenu(disk_layout_config=None).run()
 	arch_config_handler.config.disk_config = disk_config
 
@@ -76,7 +76,7 @@ def _minimal() -> None:
 			aborted = True
 
 		if aborted:
-			return _minimal()
+			return main()
 
 	if arch_config_handler.config.disk_config:
 		fs_handler = FilesystemHandler(arch_config_handler.config.disk_config)
@@ -85,4 +85,5 @@ def _minimal() -> None:
 	perform_installation(arch_config_handler.args.mountpoint)
 
 
-_minimal()
+if __name__ == '__main__':
+	main()

archinstall/scripts/only_hd.py

@@ -54,7 +54,7 @@ def perform_installation(mountpoint: Path) -> None:
 	debug(f'Disk states after installing:\n{disk_layouts()}')
 
 
-def _only_hd() -> None:
+def main() -> None:
 	if not arch_config_handler.args.silent:
 		ask_user_questions()
 
@@ -72,7 +72,7 @@ def _only_hd() -> None:
 			aborted = True
 
 		if aborted:
-			return _only_hd()
+			return main()
 
 	if arch_config_handler.config.disk_config:
 		fs_handler = FilesystemHandler(arch_config_handler.config.disk_config)
@@ -81,4 +81,5 @@ def _only_hd() -> None:
 	perform_installation(arch_config_handler.args.mountpoint)
 
 
-_only_hd()
+if __name__ == '__main__':
+	main()