Testing: Bubbles mods
Signed-off-by: debianpepper <pdpdebdevuan@protonmail.com>
This commit is contained in:
parent
edfa2998c8
commit
f0ce2b9889
|
@ -46,6 +46,7 @@ class BuildXfce:
|
|||
def __init__(self, sbase, sarch):
|
||||
self.sbase = sbase
|
||||
self.sarch = sarch
|
||||
|
||||
os.chdir(HOME_FOLDER + FUSATO_ROOT)
|
||||
# Determine what base to build
|
||||
if sbase == "deb":
|
||||
|
@ -62,7 +63,7 @@ class BuildXfce:
|
|||
Used to build the Debian base XFCE ISO
|
||||
"""
|
||||
if self.sarch == '_64':
|
||||
self.build_deb_64()
|
||||
self.build_system()
|
||||
elif self.sarch == '_32':
|
||||
self.build_deb_32()
|
||||
elif self.sarch == '_arm':
|
||||
|
@ -70,45 +71,45 @@ class BuildXfce:
|
|||
else:
|
||||
logger.warning("No active build specified!")
|
||||
|
||||
def deb_64_lb_helper(self):
|
||||
bit_arch = self.sarch[1:]
|
||||
if bit_arch == 64:
|
||||
lbsetup = conf.LBSET_DEB64
|
||||
os.system(lbsetup)
|
||||
elif bit_arch == 32:
|
||||
lbsetup = conf.LBSET_DEB32
|
||||
def lb_helper(self):
|
||||
""" Helper for the lb setup"""
|
||||
if self.sarch[1:] == "64":
|
||||
lbsetup = "conf.LBSET_" + self.sbase.upper() + self.sarch[1:]
|
||||
os.system(lbsetup)
|
||||
elif bit_arch == "arm":
|
||||
lbsetup = conf.LBSET_DEBARM
|
||||
elif self.sarch[1:] == "32":
|
||||
lbsetup = "conf.LBSET_" + self.sbase.upper() + self.sarch[1:]
|
||||
os.system(lbsetup)
|
||||
elif self.sarch[1:] == "arm":
|
||||
lbsetup = "conf.LBSET_" + self.sbase.upper()nasno + self.sarch[1:]
|
||||
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
|
||||
self.deb_64_lb_helper()
|
||||
# Start with the XFCE stuff
|
||||
if bit_arch == 64:
|
||||
def infra_helper(self):
|
||||
""" Helper for the infra classes """
|
||||
infra.ChrootFolders(self.sbase, self.sarch)
|
||||
infra.BinaryFolders(self.sbase, self.sarch)
|
||||
infra.ArchitectureFiles(self.sbase, self.sarch)
|
||||
infra.Archive(self.sbase, self.sarch)
|
||||
|
||||
|
||||
def xfce_helper(self):
|
||||
""" Helper for the xfce desktop """
|
||||
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 + '()'
|
||||
exec(execute)
|
||||
elif bit_arch == 32:
|
||||
elif self.sarch[1:] == "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":
|
||||
elif self.sarch[1:] == "arm":
|
||||
cmd_list_arm = collections.deque(conf.buildarm_xfce_build)
|
||||
list_size_arm = len(cmd_list_arm)
|
||||
for _ in range(list_size_arm):
|
||||
|
@ -117,17 +118,24 @@ class BuildXfce:
|
|||
exec(execute)
|
||||
else:
|
||||
cmd_list = None
|
||||
|
||||
|
||||
def build_system(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)
|
||||
# Set the config tree
|
||||
self.lb_helper()
|
||||
# Start with the XFCE stuff
|
||||
self.xfce_helper()
|
||||
# Run the specific classes
|
||||
infra.ChrootFolders(self.sbase, self.sarch)
|
||||
infra.BinaryFolders(self.sbase, self.sarch)
|
||||
infra.ArchitectureFiles(self.sbase, self.sarch)
|
||||
infra.Archive(self.sbase, self.sarch)
|
||||
self.infra_helper()
|
||||
# Run the Build
|
||||
logger.info(CFG_READY)
|
||||
logger.info(START_LIVEBUILD)
|
||||
logger.info(dir_current)
|
||||
self.deb_64_lb_helper()
|
||||
self.lb_helper()
|
||||
run_cmd = 'sudo lb build'
|
||||
current_working_directory = os.getcwd()
|
||||
os.chdir(HOME_FOLDER + FUSATO_ROOT)
|
||||
|
|
Loading…
Reference in New Issue