diff --git a/python_modules/fresh_bubble.py b/python_modules/fresh_bubble.py index df8fb273..99fdbc00 100644 --- a/python_modules/fresh_bubble.py +++ b/python_modules/fresh_bubble.py @@ -23,11 +23,11 @@ def set_config_structure(): # you can add additional, folders to the array as needed, you can also # remove a folder if you do not deem it necessary to be used folders = ["aliases", "xfce", "wallpaper", "user_config", "theme", - "sources", "icons", "gksudo", "profile", "polkit", + "sources", "icons", "profile", "polkit", "plymouth", "osrelease", "multimedia", "menu", "splash", "lightdm", "issue", "info", "hooks", "grub", "font", "desktop_base", "database", "calamares_settings", - "application", "PepProPixMaps", "PepProTools", "packages" + "application", "PepProPixMaps", "PepProTools", "packages", "id_files" ] for f in folders: if os.path.exists(f): @@ -37,4 +37,4 @@ def set_config_structure(): else: os.makedirs(f) -set_config_structure() \ No newline at end of file +set_config_structure() diff --git a/python_modules/inflate_bubble.py b/python_modules/inflate_bubble.py index e66293e8..2c7844e0 100644 --- a/python_modules/inflate_bubble.py +++ b/python_modules/inflate_bubble.py @@ -42,6 +42,7 @@ def set_fusato_structure(): 'etc/skel/.local/share', 'etc/skel/.config/autostart/', 'etc/lightdm/lightdm.conf.d/', + 'usr/share/peppermint/pep_id/', ] os.chdir(os.path.join(HOME_FOLDER, FUSATO_ROOT)) if os.path.exists('config'): @@ -87,6 +88,11 @@ def make_bld_openbox(base,arch): """Write the openbox build file""" make_build_file(base, arch, 'opb', 'OpenBox Build') + +def make_bld_loaded(base,arch): + """Write the loaded build file""" + make_build_file(base, arch, 'loaded', 'Loaded xfce Build') + # Make the shared package lists files def make_package_list(file_name, content, mode='a'): """Create the package list file with the specified content""" @@ -130,6 +136,9 @@ def set_opb(): """ Create the list for the openbox list""" make_package_list('opb.list.chroot', conf.OPENBOX_LIST, mode='x') +def set_loaded(): + """ Create the list for the loaded list""" + make_package_list('loaded.list.chroot', conf.LOADED_LIST, mode='x') # CHROOT Specific diff --git a/python_modules/infra.py b/python_modules/infra.py index 90173cd6..1498980b 100644 --- a/python_modules/infra.py +++ b/python_modules/infra.py @@ -472,21 +472,22 @@ def open_box_configs(): dirs_exist_ok = True ) logger.info(MSG_FIN + HOME_FOLDER + WPCHROOT + des_ob) - + + def loaded_xfce_configs(): """ - Copy the openbox files + Copy the loaded xfce files """ logger.info("Copy loaded xfce configs") src_ob = '/loaded-xfce' des_ob = '/etc/skel/' - logger.info("INFO: Copying - " + HOME_FOLDER + src_ob) + logger.info("INFO: Copying - " + HOME_FOLDER + src_loaded) shutil.copytree(HOME_FOLDER + src_ob, - HOME_FOLDER + WPCHROOT + des_ob, + HOME_FOLDER + WPCHROOT + des_loaded, dirs_exist_ok = True ) - logger.info(MSG_FIN + HOME_FOLDER + WPCHROOT + des_ob) + logger.info(MSG_FIN + HOME_FOLDER + WPCHROOT + des_loaded)