Corrected Issues found by Manuel

- Took out the Desktopbase
- Added in the Peppermint repos
- Took Plank out of auto start. Cavy wanted planl to ship with the XFCE but
not auto start

Signed-off-by: debianpepper <pdpdebdevuan@protonmail.com>
This commit is contained in:
debianpepper 2023-09-01 14:00:46 +09:00
parent d733723653
commit 3d542c85d5
3 changed files with 8 additions and 24 deletions

View File

@ -0,0 +1,2 @@
deb http://repo.peppermintos.com/packages peppermint main contrib non-free
deb-src http://repo.peppermintos.com/packages peppermint main contrib non-free

View File

@ -99,7 +99,7 @@ xfce_list = ('xfce4\n'
'plank\n'
'mugshot\n'
'menulibre\n'
#'marwaita-for-xfwm'
'marwaita-for-xfwm'
)

View File

@ -24,17 +24,6 @@ BOOTSTRAP = "/fusato/config/includes.bootstrap"
FUSATOCONFIG = "/fusato/config"
term_size = os.get_terminal_size()
class Processing(list):
def __enter__(self):
self._stdout = sys.stdout
sys.stdout = self._stringio = StringIO()
return self
def __exit__(self, *args):
self.extend(self._stringio.getvalue().splitlines())
del self._stringio # free up some memory
sys.stdout = self._stdout
class ChrootFolders:
"""
Copy all the needed folders to CHROOT Depending on
@ -210,12 +199,7 @@ def shared_folders():
'/pmostools',
'/autostart',
'/pylibraries',
'/desktop_base/lines-theme/grub',
'/desktop_base/lines-theme/lockscreen',
'/desktop_base/lines-theme/login',
'/desktop_base/lines-theme/wallpaper',
'/calamares_settings/branding'
)
des_paths =('/usr/share/plymouth/themes/lines',
'/usr/share/applications',
@ -234,10 +218,6 @@ def shared_folders():
'/etc/skel/.local/share/pmostools',
'/etc/skel/.config/autostart',
'/usr/lib/python3/dist-packages',
'/usr/share/desktop-base/lines-theme/grub',
'/usr/share/desktop-base/lines-theme/lockscreen',
'/usr/share/desktop-base/lines-theme/login',
'/usr/share/desktop-base/lines-theme/wallpaper',
'/etc/calamares/branding'
)
src_q = collections.deque(src_paths)
@ -317,6 +297,7 @@ def shared_files():
print("Copy Shared Files")
print('=' * term_size.columns)
src_paths = ('/aliases/bash_aliases',
'/sources/peppermint.list',
'/PepProTools/xDaily',
'/PepProTools/hub',
'/PepProTools/welcome',
@ -324,9 +305,10 @@ def shared_files():
'/lightdm/lightdm.conf',
'/lightdm/lightdm-gtk-greeter.conf',
'/plymouth/plymouthd.conf',
'/application/plank.desktop'
)
des_paths = ('/etc/skel/.bash_aliases',
'/etc/apt/sources.list.d',
'/usr/local/bin/xDaily',
'/usr/local/bin/hub',
'/usr/local/bin/welcome',
@ -334,7 +316,7 @@ def shared_files():
'/etc/lightdm/lightdm.conf',
'/etc/lightdm/lightdm-gtk-greeter.conf',
'/usr/share/plymouthd.conf',
'/etc/skel/.config/autostart/plank.desktop',
)
# copy files to thier CHROOT Location
src_q = collections.deque(src_paths)