From 351652aece57afd48a84309adb3862c5ab1385d9 Mon Sep 17 00:00:00 2001 From: debianpepper Date: Fri, 23 Aug 2024 17:09:18 +0900 Subject: [PATCH] Update: Removed any Pepadmin ref Removed any hardcoded Pepadmin references Signed-off-by: debianpepper --- iso_configs/pylibraries/pepperpy/hooks.py | 9 +-------- python_modules/conf.py | 2 -- python_modules/infra.py | 9 ++++++--- testtommy | 0 4 files changed, 7 insertions(+), 13 deletions(-) delete mode 100644 testtommy diff --git a/iso_configs/pylibraries/pepperpy/hooks.py b/iso_configs/pylibraries/pepperpy/hooks.py index 78415f20..758e32b5 100644 --- a/iso_configs/pylibraries/pepperpy/hooks.py +++ b/iso_configs/pylibraries/pepperpy/hooks.py @@ -1,11 +1,4 @@ -""" -* Author: "PeppermintOS Team(peppermintosteam@proton.me) -* -* License: SPDX-License-Identifier: GPL-3.0-or-later -* -* This hook is the central one used for all the builds -* Add things as needed -""" +" import os import platform diff --git a/python_modules/conf.py b/python_modules/conf.py index 80a11db5..c9a273be 100644 --- a/python_modules/conf.py +++ b/python_modules/conf.py @@ -272,8 +272,6 @@ LOADED_LIST = ('xfce4\n' 'transmission-gtk\n' 'thunderbird\n' 'thunderbird-l10n-all\n' - #'firefox-esr\n' start testing firefox latest install - #'firefox-esr-l10n-all\n' 'libreoffice\n' 'libreoffice-gtk3\n' 'libreoffice-l10n*\n' diff --git a/python_modules/infra.py b/python_modules/infra.py index a808ecf6..523d21c7 100644 --- a/python_modules/infra.py +++ b/python_modules/infra.py @@ -363,8 +363,11 @@ def get_id_build_type(): """ This will get the type of build that is taking place """ - source_folder = '/home/pepadmin/start/bldtype' - dest_folder = '/home/pepadmin/bubbles/iso_configs/fusato/config/includes.chroot/opt/pepconf' + source_folder = os.path.expanduser('~/start/bldtype') + dest_folder = os.path.join(os.path.expanduser('~'),'bubbles', + 'iso_configs','fusato','config','includes.chroot','opt', + 'pepconf' + ) os.makedirs(dest_folder, exist_ok=True) for filename in os.listdir(source_folder): src_file = os.path.join(source_folder, filename) @@ -383,7 +386,7 @@ def add_web_profile(): typ """ logger.info("Copy Web Profiles") - path_to_bldtype_file = '/home/pepadmin/start/bldtype/' + path_to_bldtype_file = os.path.expanduser('~/start/bldtype') lw_src_path = '/browser_profiles/lw/' ff_src_path = '/browser_profiles/ff/' des_src_path ='/etc/skel/.local/share/pmostools' diff --git a/testtommy b/testtommy deleted file mode 100644 index e69de29b..00000000