Peppermint
/
bubbles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update: Build_ISO.py modded and refractored 

Signed-off-by: debianpepper <pdpdebdevuan@protonmail.com>
This commit is contained in:
debianpepper 2023-12-12 22:00:29 +09:00
parent ccb5014e6f
commit 9ea7cd57e0
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
python_modules/build_iso.py
View File

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