Testintg: Bubbles Mod

Signed-off-by: debianpepper <pdpdebdevuan@protonmail.com>
This commit is contained in:
debianpepper 2023-09-29 20:24:47 +09:00
parent 6b61c57890
commit 54d0d9510b
1 changed files with 39 additions and 36 deletions

View File

@ -70,38 +70,7 @@ class BuildXfce:
else:
logger.warning("No active build specified!")
def build_deb_64(self):
""" Builds the 64bit ISO XFCE"""
current_working_directory = os.getcwd()
dir_current = "Current working directory" + current_working_directory
logger.info("Building a " + self.sbase + self.sarch[1:] + " bit ISO")
logger.info(dir_current)
bit_arch = self.sarch[1:]
# Start with the XFCE stuff
if bit_arch == 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 + '()'
exec(execute)
elif bit_arch == 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 bit_arch == "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
# Set the config tree
def deb_64_lb_helper():
if bit_arch == 64:
lbsetup = conf.LBSET_DEB64
os.system(lbsetup)
@ -113,6 +82,41 @@ class BuildXfce:
os.system(lbsetup)
else:
lbsetup = None
def build_deb_64(self):
""" Builds the 64bit ISO XFCE"""
current_working_directory = os.getcwd()
dir_current = "Current working directory" + current_working_directory
logger.info("Building a " + self.sbase + self.sarch[1:] + " bit ISO")
logger.info(dir_current)
bit_arch = self.sarch[1:]
# Set the config tree
deb_64_lb_helper()
# Start with the XFCE stuff
if bit_arch == 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 + '()'
exec(execute)
elif bit_arch == 32:
cmd_list_32 = collections.deque(conf.build32_xfce_build)
list_size_32 = len(cmd_list_32)
for _ in range(list_size_32):
i = cmd_list_32.popleft()
execute = i + '()'
exec(execute)
elif bit_arch == "arm":
cmd_list_arm = collections.deque(conf.buildarm_xfce_build)
list_size_arm = len(cmd_list_arm)
for _ in range(list_size_arm):
i = cmd_list_arm.popleft()
execute = i + '()'
exec(execute)
else:
cmd_list = None
# Run the specific classes
infra.ChrootFolders(self.sbase, self.sarch)
infra.BinaryFolders(self.sbase, self.sarch)
@ -122,7 +126,7 @@ class BuildXfce:
logger.info(CFG_READY)
logger.info(START_LIVEBUILD)
logger.info(dir_current)
logger.info(CFG_TREE_READY)
deb_64_lb_helper()
run_cmd = 'sudo lb build'
current_working_directory = os.getcwd()
os.chdir(HOME_FOLDER + FUSATO_ROOT)
@ -131,7 +135,7 @@ class BuildXfce:
logger.info(dir_current)
os.system(run_cmd)
logger.info(BUILD_COMPLETED)
logger.info(dir_current)
logger.info(dir_current)
finish_cleanup.make_check_sum()
finish_cleanup.copy_debian_xfce_based()
finish_cleanup.kill_old_iso()
@ -690,10 +694,9 @@ def readybuild():
rm_cmd = "sudo rm -r -f fusato"
os.system(rm_cmd)
os.makedirs('fusato')
inflate_bubble.set_fusato_structure()
else:
os.makedirs('fusato')
inflate_bubble.set_fusato_structure()
class Decsions: