diff --git a/python_modules/build_iso.py b/python_modules/build_iso.py index 9d10e60b..28df2c8e 100644 --- a/python_modules/build_iso.py +++ b/python_modules/build_iso.py @@ -87,29 +87,14 @@ class BuildXfce: """ Helper for the xfce desktop shared for all builds """ - if self.sarch[1:] == "64": - cmd_list = collections.deque(conf.build64_xfce_build) - list_size = len(cmd_list) - for _ in range(list_size): - i = cmd_list.popleft() - execute = i + '()' + arch_suffix = self.sarch[1:] + cmd_list = None + if arch_suffix in ["64", "32", "arm"]: + cmd_list = getattr(conf, f"build{arch_suffix}_xfce_build", []) + for command in cmd_list: + execute = command + '()' exec(execute) - elif self.sarch[1:] == "32": - cmd_list = collections.deque(conf.build32_xfce_build) - list_size = len(cmd_list) - for _ in range(list_size): - i = cmd_list.popleft() - execute = i + '()' - exec(execute) - elif self.sarch[1:] == "arm": - cmd_list = collections.deque(conf.buildarm_xfce_build) - list_size = len(cmd_list) - for _ in range(list_size): - i = cmd_list.popleft() - execute = i + '()' - exec(execute) - else: - cmd_list = None + return cmd_list def cleanup_helper(self): @@ -131,6 +116,7 @@ class BuildXfce: logger.info(CFG_READY) logger.info(START_LIVEBUILD) logger.info(dir_current) + self.lb_helper() run_cmd = 'sudo lb build' os.chdir(HOME_FOLDER + FUSATO_ROOT) inflate_bubble.make_bld_xfce(self.sbase, self.sarch[1:])