diff --git a/python_modules/build_iso.py b/python_modules/build_iso.py index bc6713ac..9c159b86 100644 --- a/python_modules/build_iso.py +++ b/python_modules/build_iso.py @@ -65,7 +65,7 @@ class BuildXfce: if self.sbase in ["deb", "dev"]: arch_suffix = self.sarch[1:] if arch_suffix in ["64", "32", "arm"]: - lbsetup = getattr(conf, + lbsetup = getattr(conf, f"LBSET_{self.sbase.upper()}{arch_suffix}" ) os.system(lbsetup) @@ -134,7 +134,6 @@ class BuildXfce: logger.info(BUILD_COMPLETED) - class BuildGflashback: """ Determine what base to use and then build the ISO @@ -160,7 +159,7 @@ class BuildGflashback: if self.sbase in ["deb", "dev"]: arch_suffix = self.sarch[1:] if arch_suffix in ["64", "32", "arm"]: - lbsetup = getattr(conf, + lbsetup = getattr(conf, f"LBSET_{self.sbase.upper()}{arch_suffix}" ) os.system(lbsetup) @@ -197,23 +196,31 @@ class BuildGflashback: finish_cleanup.make_check_sum() finish_cleanup.check_build_type_gfb() finish_cleanup.kill_old_iso() - + def build_system(self): """ Builds the ISO GFB Depedning on the Arch """ current_working_directory = os.getcwd() dir_current = WRKING_DIR + current_working_directory - logger.info(f"Building a {self.sbase}{self.sarch[1:]} bit ISO") + logger.info("Building a " + self.sbase + self.sarch[1:] + " bit ISO") logger.info(dir_current) + # Set the config tree self.lb_helper() + # Start with the XFCE stuff self.gfb_helper() + # Run the specific classes self.infra_helper() + # Run the Build logger.info(CFG_READY) logger.info(START_LIVEBUILD) logger.info(dir_current) + self.lb_helper() run_cmd = 'sudo lb build' + current_working_directory = os.getcwd() os.chdir(HOME_FOLDER + FUSATO_ROOT) + # Set the build inidcator inflate_bubble.make_bld_gnomeflashback(self.sbase, self.sarch[1:]) + logger.info(dir_current) os.system(run_cmd) logger.info(BUILD_COMPLETED) logger.info(dir_current)