From 999e9896b641cdea9bfa09c636590d32556d69e1 Mon Sep 17 00:00:00 2001 From: debianpepper Date: Thu, 24 Aug 2023 15:31:14 +0900 Subject: [PATCH] Corrected inflatebubble syntax bug Signed-off-by: debianpepper --- python_modules/inflate_bubble.py | 50 +++++++++++++++----------------- 1 file changed, 23 insertions(+), 27 deletions(-) diff --git a/python_modules/inflate_bubble.py b/python_modules/inflate_bubble.py index 82f05af8..1ceaad82 100644 --- a/python_modules/inflate_bubble.py +++ b/python_modules/inflate_bubble.py @@ -9,7 +9,6 @@ import os from pathlib import Path -import paths import conf # Set the home path used regardless the user logged in @@ -42,44 +41,42 @@ def set_fusato_structure(): 'etc/skel/.local/share', 'etc/skel/.config/autostart/' ] - make_bootstrap =['/etc/apt'] - + make_bootstrap = ['/etc/apt'] make_chfldrs = make_chroot - for f in make_chfldrs: - os.makedirs(HOME_FOLDER + CHROOT_FOLDER + f) - + for f_f in make_chfldrs: + os.makedirs(HOME_FOLDER + CHROOT_FOLDER + f_f) make_bsfldrs = make_bootstrap - for f in make_bsfldrs: - os.makedirs(HOME_FOLDER + BOOTSTRAP_FOLDER + f) + for f_f in make_bsfldrs: + os.makedirs(HOME_FOLDER + BOOTSTRAP_FOLDER + f_f) # Commonly Shared def set_general_shared(): """ Create the list for general shared list""" with open(HOME_FOLDER + PACKAGE_LIST + 'genshared.list.chroot', 'x', - encoding='UTF-8') as general_file: - general_file.write(conf.general_shared_list) + encoding='UTF-8') as general_file: + general_file.write(conf.general_shared_list) def set_grub_shared(): """ Create the list for shared grub list""" with open(HOME_FOLDER + PACKAGE_LIST + 'grub.list.chroot', 'x', encoding='UTF-8') as system_file: - system_file.write(conf.grub_list_shared) + system_file.write(conf.grub_list_shared) def set_binary_shared(): """ Create the shared list for grub binary""" with open(HOME_FOLDER + PACKAGE_LIST + 'installer.list.binary', 'x', encoding='UTF-8') as binary_file: - binary_file.write(conf.binary_list_shared) + binary_file.write(conf.binary_list_shared) def set_lightdm(): """ Create the list for the light dm list """ - with open( HOME_FOLDER + PACKAGE_LIST + 'lightdm.list.chroot', 'x', - encoding='UTF-8') as lighdm_file: - lightdm_file.write(conf.light_dm_list) + with open(HOME_FOLDER + PACKAGE_LIST + 'lightdm.list.chroot', 'x', + encoding='UTF-8') as lightdm_file: + lightdm_file.write(conf.light_dm_list) # Desktop Environments @@ -87,8 +84,7 @@ def set_xfce(): """ Create the list for the xfce xfce list""" with open(HOME_FOLDER + PACKAGE_LIST + 'xfce.list.chroot', 'x', encoding='UTF-8') as xfce_file: - xfce_file.write(conf.xfce_list) - + xfce_file.write(conf.xfce_list) # CHROOT Specific @@ -96,21 +92,21 @@ def set_chroot_grub_64(): """ Append the grub list for 64 bit grub""" with open(HOME_FOLDER + PACKAGE_LIST + 'grub.list.chroot', 'a', encoding='UTF-8') as system_file: - system_file.write(conf.grub_list_64) + system_file.write(conf.grub_list_64) def set_chroot_grub_arm(): """ Append the grub list for the ARM grub""" with open(HOME_FOLDER + PACKAGE_LIST + 'grub.list.chroot', 'a', encoding='UTF-8') as system_file: - system_file.write(conf.grub_list_arm64) + system_file.write(conf.grub_list_arm64) def set_chroot_grub_32(): """ Append the grub list for the 32 bit grub""" with open(HOME_FOLDER + PACKAGE_LIST + 'grub.list.chroot', 'a', encoding='UTF-8') as system_file: - system_file.write(conf.grub_list_32) + system_file.write(conf.grub_list_32) # Binary Specific @@ -118,33 +114,33 @@ def set_binary_64(): """ Create the list for grub binary packages for 64 bit""" with open(HOME_FOLDER + PACKAGE_LIST + 'installer.list.binary', 'a', encoding='UTF-8') as binary_file: - binary_file.write(conf.binary_list_64) + binary_file.write(conf.binary_list_64) def set_binary_arm(): """ Create the list for grub binary packages for 64 bit""" with open(HOME_FOLDER + PACKAGE_LIST + 'installer.list.binary', 'a', encoding='UTF-8') as binary_file: - binary_file.write(conf.binary_list_arm) + binary_file.write(conf.binary_list_arm) def set_binary_32(): """ Create the list for grub binary packages for 32 bit""" with open(HOME_FOLDER + PACKAGE_LIST + 'installer.list.binary', 'a', encoding='UTF-8') as binary_file: - binary_file.write(conf.binary_list_32) + binary_file.write(conf.binary_list_32) # Firmware Specific def set_firmware(): """ Create the list for the firmware support for genral ISOs""" - with open(HOME_FOLDER + PACKAGE_LIST +'firmware.list.chroot', 'x', + with open(HOME_FOLDER + PACKAGE_LIST + 'firmware.list.chroot', 'x', encoding='UTF-8') as firmware_file: - firmware_file.write(conf.firmware_list_32_64) + firmware_file.write(conf.firmware_list_32_64) def set_firmware_arm(): """ Create the list for the firmware support for arm ISOs""" - with open(HOME_FOLDER + PACKAGE_LIST +'firmware.list.chroot', 'x', + with open(HOME_FOLDER + PACKAGE_LIST + 'firmware.list.chroot', 'x', encoding='UTF-8') as firmware_file: - firmware_file.write(conf.firmware_list_arm) + firmware_file.write(conf.firmware_list_arm)