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

Testing: Modules 

Signed-off-by: debianpepper <pdpdebdevuan@protonmail.com>
This commit is contained in:
debianpepper 2023-12-14 11:54:40 +09:00
parent 35236f2d1c
commit f2b89ce3c1
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
python_modules/build_iso.py
View File

@ -112,8 +112,8 @@ class BuildBase:
class BuildXfce(BuildBase): class BuildXfce(BuildBase):
""" This class will ensure the xfce builds are built """ """ This class will ensure the xfce builds are built """
def __init__(self, sbase, sarch): def __init__(self, sbase, sarch):
""" i """
nit the building, super will init the building, super will
ensure that the method resolution order (MRO) is followed ensure that the method resolution order (MRO) is followed
correctly, allowing for a smooth inheritance hierarchy. correctly, allowing for a smooth inheritance hierarchy.
""" """
@ -123,6 +123,9 @@ class BuildXfce(BuildBase):
""" The helper functions to ensure the xfce requirements are used """ """ The helper functions to ensure the xfce requirements are used """
arch_suffix = self.sarch[1:] arch_suffix = self.sarch[1:]
cmd_list = None cmd_list = None
if self.sbase in ["deb", "dev"]:
if arch_suffix in ["64", "32", "arm"]:
os.system(f'touch {self.sbase.upper()}.{arch_suffix}xfc')
if arch_suffix in ["64", "32", "arm"]: if arch_suffix in ["64", "32", "arm"]:
cmd_list = getattr(conf, f"build{arch_suffix}_xfce_build", []) cmd_list = getattr(conf, f"build{arch_suffix}_xfce_build", [])
for command in cmd_list: for command in cmd_list:

1
python_modules/conf.py
View File

@ -164,6 +164,7 @@ GENERAL_SHARED_LIST = ('alsa-utils\n'
'python3-pip\n' 'python3-pip\n'
'python3-tk\n' 'python3-tk\n'
'python3-pil.imagetk\n' 'python3-pil.imagetk\n'
'python3-xapian\n'
'synaptic\n' 'synaptic\n'
'system-config-printer\n' 'system-config-printer\n'
'simple-scan\n' 'simple-scan\n'

14
python_modules/finish_cleanup.py
View File

@ -48,7 +48,6 @@ def process_iso(base, arch, desktop):
src_iso = files src_iso = files
rdes = f"{BASE_NAME}-{base}_{arch}_{desktop.lower()}{today}.iso" rdes = f"{BASE_NAME}-{base}_{arch}_{desktop.lower()}{today}.iso"
des_iso =f"{BASE_DESTINATION}/{base.lower()}{arch}/{desktop.lower()}" des_iso =f"{BASE_DESTINATION}/{base.lower()}{arch}/{desktop.lower()}"
os.system(f'touch {base}.{arch}{desktop.lower()}')
os.rename(src_iso, rdes) os.rename(src_iso, rdes)
shutil.copy(rdes, des_iso) shutil.copy(rdes, des_iso)
@ -56,7 +55,6 @@ def process_iso(base, arch, desktop):
src_sum = files src_sum = files
rdes_sum = f"{BASE_NAME}{base.capitalize()}_{arch}_{desktop.lower()}-sha512.checksum" rdes_sum = f"{BASE_NAME}{base.capitalize()}_{arch}_{desktop.lower()}-sha512.checksum"
des_sum = f"{BASE_DESTINATION}/{base.lower()}{arch}/{desktop.lower()}" des_sum = f"{BASE_DESTINATION}/{base.lower()}{arch}/{desktop.lower()}"
os.rename(src_sum, rdes_sum) os.rename(src_sum, rdes_sum)
shutil.copy(rdes_sum, des_sum) shutil.copy(rdes_sum, des_sum)
@ -67,12 +65,12 @@ def check_build_type():
os.chdir(HOME_FOLDER + FUSATO_ROOT) os.chdir(HOME_FOLDER + FUSATO_ROOT)
directory_path = HOME_FOLDER + FUSATO_ROOT directory_path = HOME_FOLDER + FUSATO_ROOT
file_function_mapping = { file_function_mapping = {
'deb.64xfce': ('deb', '64', 'XFCE'), 'deb.64xfc': ('deb', '64', 'XFCE'),
'deb.32xfce': ('deb', '32', 'XFCE'), 'deb.32xfc': ('deb', '32', 'XFCE'),
'deb.armxfce': ('deb', 'arm', 'XFCE'), 'deb.armxfc': ('deb', 'arm', 'XFCE'),
'dev.64xfce': ('dev', '64', 'XFCE'), 'dev.64xfc': ('dev', '64', 'XFCE'),
'dev.32xfce': ('dev', '32', 'XFCE'), 'dev.32xfc': ('dev', '32', 'XFCE'),
'dev.armxfce': ('dev', 'arm', 'XFCE'), 'dev.armxfc': ('dev', 'arm', 'XFCE'),
'deb.64gfb': ('deb', '64', 'GFB'), 'deb.64gfb': ('deb', '64', 'GFB'),
'deb.32gfb': ('deb', '32', 'GFB'), 'deb.32gfb': ('deb', '32', 'GFB'),
'deb.armgfb': ('deb', 'arm', 'GFB'), 'deb.armgfb': ('deb', 'arm', 'GFB'),