From 6acb901f39860a728e260f1ca2dd95facc4eda9c Mon Sep 17 00:00:00 2001 From: Manuel Date: Thu, 23 Feb 2023 16:11:48 -0100 Subject: [PATCH] new commit --- BldHelper-nightly.sh | 2 +- PepBld-nightly.sh | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/BldHelper-nightly.sh b/BldHelper-nightly.sh index 9f591319b..209cfa34b 100755 --- a/BldHelper-nightly.sh +++ b/BldHelper-nightly.sh @@ -6,7 +6,7 @@ ### ## # Set build working variables HERE # ## ### -PREFIX=PepOS # Sets a unique final name of the ISO and checksum so only removes 2 files . +PREFIX=PepOS-testing # Sets a unique final name of the ISO and checksum so only removes 2 files . SUFFIX=amd64 # Also used by . And to distinguish between amd64 and x86 or devuan and ubuntu . BUILD=nightly # Sets which pepbld.sh to use and the location in /var/www/html/[release|rc|testing|nightly|unstable] diff --git a/PepBld-nightly.sh b/PepBld-nightly.sh index 68b2e4ac6..6515a402f 100755 --- a/PepBld-nightly.sh +++ b/PepBld-nightly.sh @@ -250,15 +250,12 @@ cp $uchinanchu/pepcal/adddesktopicon/add-calamares-desktop-icon $uchinanchu/fusa cp $uchinanchu/pepcal/calamares/settings.conf $uchinanchu/fusato/config/includes.chroot/etc/calamares cp $uchinanchu/peplightdm/lightdm.conf $uchinanchu/fusato/config/includes.chroot/etc/lightdm cp $uchinanchu/peplightdm/lightdm-gtk-greeter.conf $uchinanchu/fusato/config/includes.chroot/etc/lightdm -cp $uchinanchu/peplightdm/slick-greeter.conf $uchinanchu/fusato/config/includes.chroot/etc/lightdm cp $uchinanchu/pepsources/sources.list $uchinanchu/fusato/config/includes.chroot/opt/pepconf cp $uchinanchu/PepProTools/xDaily $uchinanchu/fusato/config/includes.chroot/usr/local/bin cp $uchinanchu/PepProTools/Welcome_auto.desktop $uchinanchu/fusato/config/includes.chroot/etc/xdg/autostart # Copy directory contents to the chroot cp $uchinanchu/pepapplication/* $uchinanchu/fusato/config/includes.chroot/usr/share/applications -cp $uchinanchu/pepdeffileman/xfce4/helpers.rc $uchinanchu/fusato/config/includes.chroot/etc/xdg/xfce4 -cp $uchinanchu/pepdeffileman/xfce4/helpers.rc $uchinanchu/fusato/config/includes.chroot/usr/share/xfce4/helpers cp $uchinanchu/pepgrub/grub $uchinanchu/fusato/config/includes.chroot/etc/default cp $uchinanchu/pephooks/live/* $uchinanchu/fusato/config/includes.chroot/usr/lib/live/config cp $uchinanchu/pephooks/normal/* $uchinanchu/fusato/config/hooks/normal @@ -268,13 +265,12 @@ cp $uchinanchu/pepissue/* $uchinanchu/fusato/config/includes.chroot/opt/pepconf cp $uchinanchu/peposrelease/* $uchinanchu/fusato/config/includes.chroot/opt/pepconf cp $uchinanchu/peposrelease/* $uchinanchu/fusato/config/includes.chroot/usr/lib cp $uchinanchu/peppolkit/* $uchinanchu/fusato/config/includes.chroot/usr/share/polkit-1/actions -cp $uchinanchu/pepstartpage/* $uchinanchu/fusato/config/includes.chroot/opt/startpep cp $uchinanchu/pepdb/* $uchinanchu/fusato/config/includes.chroot/opt/pypep/dbpep cp $uchinanchu/pepuserconfig/* $uchinanchu/fusato/config/includes.chroot/etc/live/config.conf.d cp $uchinanchu/PepProPixMaps/* $uchinanchu/fusato/config/includes.chroot/usr/share/pixmaps -cp $uchinanchu/PepProTools/* $uchinanchu/fusato/config/includes.chroot/opt/pypep # Copy recursive files and sub-directories, containing symlinks. +cp -r $uchinanchu/PepProTools/* $uchinanchu/fusato/config/includes.chroot/opt/pypep cp -r $uchinanchu/pepcal/calamares/branding $uchinanchu/fusato/config/includes.chroot/etc/calamares cp -r $uchinanchu/pepcal/calamares/modules $uchinanchu/fusato/config/includes.chroot/etc/calamares cp -r $uchinanchu/pepxfce/xfce4/panel $uchinanchu/fusato/config/includes.chroot/etc/skel/.config/xfce4