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

Updated 

Signed-off-by: debianpepper <pdpdebdevuan@protonmail.com>
This commit is contained in:
debianpepper 2023-08-26 20:58:37 +09:00
parent 61f8ec23b7
commit 5e5c01e156
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
python_modules/build_iso.py
View File

@ -23,6 +23,7 @@ BSTRING_ISO_CONFIGS = '~/bubbles/iso_configs'
HOME_FOLDER = str(Path(BSTRING_ISO_CONFIGS).expanduser()) HOME_FOLDER = str(Path(BSTRING_ISO_CONFIGS).expanduser())
FUSATO_ROOT = '/fusato' FUSATO_ROOT = '/fusato'
WPCHROOT = '/fusato/config/includes.chroot' WPCHROOT = '/fusato/config/includes.chroot'
term_size = os.get_terminal_size()
class BuildXfce: class BuildXfce:
@ -58,11 +59,12 @@ class BuildXfce:
""" """
if self.sarch == '_64': if self.sarch == '_64':
# livebuild init # livebuild init
print("Begin Live Build init") print('=' * term_size.columns)
print("INFO: Begin Live Build init")
print('=' * term_size.columns)
lbsetup = conf.lbset_deb64 lbsetup = conf.lbset_deb64
os.system(lbsetup) os.system(lbsetup)
# Loop though commands # Loop though commands
print("Run the 64 bit Debian commands")
cmd_list_64 = collections.deque(conf.build64_xfce_build) cmd_list_64 = collections.deque(conf.build64_xfce_build)
list_size_64 = len(cmd_list_64) list_size_64 = len(cmd_list_64)
for _ in range(list_size_64): for _ in range(list_size_64):
@ -70,12 +72,16 @@ class BuildXfce:
execute = i + '()' execute = i + '()'
exec(execute) exec(execute)
# Run the specific classes # Run the specific classes
print("Run the CHROOT, Binary and Arch Classes") print('=' * term_size.columns)
print("INFO: Run the CHROOT, Binary and Arch Classes")
print('=' * term_size.columns)
infra.ChrootFolders("deb", "_64") infra.ChrootFolders("deb", "_64")
infra.BinaryFolders("deb", "_64") infra.BinaryFolders("deb", "_64")
infra.ArchitectureFiles("deb", "_64") infra.ArchitectureFiles("deb", "_64")
# Run the Build # Run the Build
print("Run the build commands for the ISO") print('=' * term_size.columns)
print("INFO: Configs in place start the ISO build process")
print('=' * term_size.columns)
self.run_build() self.run_build()
# bld_list = collections.deque(conf.shared_run_build) # bld_list = collections.deque(conf.shared_run_build)

14
python_modules/infra.py
View File

@ -172,17 +172,17 @@ def set_symlinks():
pep_info = '/usr/share/python-apt/templates/Peppermint.info' pep_info = '/usr/share/python-apt/templates/Peppermint.info'
pep_mirror = '/usr/share/python-apt/templates/Peppermint.mirrors' pep_mirror = '/usr/share/python-apt/templates/Peppermint.mirrors'
pep_csv = '/usr/share/distro-info/peppermint.csv' pep_csv = '/usr/share/distro-info/peppermint.csv'
print("INFO: Copying - " + HOME_FOLDER + WPCHROOT + pep_info) print("INFO: Making - " + HOME_FOLDER + WPCHROOT + pep_info)
os.symlink('Debian.info', HOME_FOLDER + WPCHROOT + pep_info) os.symlink('Debian.info', HOME_FOLDER + WPCHROOT + pep_info)
print("INFO: Finished - " + HOME_FOLDER + WPCHROOT + pep_info) print("INFO: Finished - " + HOME_FOLDER + WPCHROOT + pep_info)
print("INFO: Copying - " + HOME_FOLDER + WPCHROOT + pep_mirror) print("INFO: Making - " + HOME_FOLDER + WPCHROOT + pep_mirror)
os.symlink('Debian.mirrors', HOME_FOLDER + WPCHROOT + pep_mirror) os.symlink('Debian.mirrors', HOME_FOLDER + WPCHROOT + pep_mirror)
print("INFO: Finished - " + HOME_FOLDER + WPCHROOT + pep_info) print("INFO: Finished - " + HOME_FOLDER + WPCHROOT + pep_info)
print("INFO: Copying - " + HOME_FOLDER + WPCHROOT + pep_csv) print("INFO: Making - " + HOME_FOLDER + WPCHROOT + pep_csv)
os.symlink('debian.csv', HOME_FOLDER + WPCHROOT + pep_csv) os.symlink('debian.csv', HOME_FOLDER + WPCHROOT + pep_csv)
print("INFO: Finished - " + HOME_FOLDER + WPCHROOT + pep_info) print("INFO: Finished - " + HOME_FOLDER + WPCHROOT + pep_info)
def shared_folders(): def shared_folders():
@ -408,7 +408,7 @@ def xfce_configs():
HOME_FOLDER + WPCHROOT + des_xfce, HOME_FOLDER + WPCHROOT + des_xfce,
dirs_exist_ok = True dirs_exist_ok = True
) )
print("INFO: Done - " + HOME_FOLDER + WPCHROOT + des_xfce) print("INFO: Finished - " + HOME_FOLDER + WPCHROOT + des_xfce)
src_thunar = '/xfce/Thunar' src_thunar = '/xfce/Thunar'
des_thunar = '/etc/skel/.config/Thunar' des_thunar = '/etc/skel/.config/Thunar'
print("INFO: Copying - " + HOME_FOLDER + src_thunar) print("INFO: Copying - " + HOME_FOLDER + src_thunar)