diff --git a/PepDeb32/pepbld.py b/PepDeb32/pepbld.py index 1dda17c..c9f6ba6 100644 --- a/PepDeb32/pepbld.py +++ b/PepDeb32/pepbld.py @@ -72,12 +72,15 @@ os.makedirs(os.path.join(uchinanchu, "fusato", "config", "hooks", "normal"), exi shutil.copy(os.path.join(uchinanchu, "pepautostart", "Welcome_auto.desktop"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "autostart")) shutil.copy(os.path.join(uchinanchu, "pepinstaller", "preseed", "preseed.cfg"), os.path.join(uchinanchu, "fusato", "config", "includes.installer")) -shutil.copytree(os.path.join(uchinanchu, "pephooks", "normal"), os.path.join(uchinanchu, "fusato", "config", "hooks", "normal"), dirs_exist_ok=True) -shutil.copytree(os.path.join(uchinanchu, "pepscripts"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "usr", "lib", "finish-install.d"), dirs_exist_ok=True) shutil.copy(os.path.join(uchinanchu, "pepsources", "multimedia.list"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "repos")) shutil.copy(os.path.join(uchinanchu, "pepsources", "peppermint.list"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "repos")) shutil.copy(os.path.join(uchinanchu, "pepsources", "sources.list"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "sources-final")) shutil.copy(os.path.join(uchinanchu, "pepsources", "sources.list"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "repos")) +shutil.copy(os.path.join(uchinanchu, "pepgrub", "grub"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "grub")) + +# Copy recursive files and sub-directories +shutil.copytree(os.path.join(uchinanchu, "pepscripts"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "usr", "lib", "finish-install.d"), dirs_exist_ok=True) +shutil.copytree(os.path.join(uchinanchu, "pephooks", "normal"), os.path.join(uchinanchu, "fusato", "config", "hooks", "normal"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "pepkeyrings"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "keyrings"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "polkit"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "polkit"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "pepapplication"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "apps"), dirs_exist_ok=True) @@ -86,8 +89,6 @@ shutil.copytree(os.path.join(uchinanchu, "PepProPixMaps"), os.path.join(uchinanc shutil.copytree(os.path.join(uchinanchu, "pepconf"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "conf"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "PepProTools"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "protools"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "peplightdm"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "lightdm"), dirs_exist_ok=True) - -# Copy recursive files and sub-directories shutil.copytree(os.path.join(uchinanchu, "peploadersplash", "debian"), os.path.join(uchinanchu, "fusato", "config", "includes.binary"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "pepinstaller"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "usr", "share"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "pepgrub", "debian"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "grub"), dirs_exist_ok=True) diff --git a/PepDeb32/pepbld.sh b/PepDeb32/pepbld.sh index a08e0b9..30d3f32 100755 --- a/PepDeb32/pepbld.sh +++ b/PepDeb32/pepbld.sh @@ -76,6 +76,7 @@ cp $uchinanchu/PepProPixMaps/* $uchinanchu/fusato/config/includes.installer/pres cp $uchinanchu/pepconf/* $uchinanchu/fusato/config/includes.installer/preseed/conf cp $uchinanchu/PepProTools/* $uchinanchu/fusato/config/includes.installer/preseed/protools cp $uchinanchu/peplightdm/* $uchinanchu/fusato/config/includes.installer/preseed/lightdm +cp $uchinanchu/pepgrub/grub $uchinanchu/fusato/config/includes.installer/preseed/grub # Copy recursive files and sub-directories cp -r $uchinanchu/peploadersplash/debian/boot $uchinanchu/fusato/config/includes.binary diff --git a/PepDeb64/pepbld.py b/PepDeb64/pepbld.py index 73d5227..983bc9a 100644 --- a/PepDeb64/pepbld.py +++ b/PepDeb64/pepbld.py @@ -69,14 +69,18 @@ os.makedirs(os.path.join(uchinanchu, "fusato", "config", "includes.installer", " os.makedirs(os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "autostart"), exist_ok=True) os.makedirs(os.path.join(uchinanchu, "fusato", "config", "hooks", "normal"), exist_ok=True) + shutil.copy(os.path.join(uchinanchu, "pepautostart", "Welcome_auto.desktop"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "autostart")) shutil.copy(os.path.join(uchinanchu, "pepinstaller", "preseed", "preseed.cfg"), os.path.join(uchinanchu, "fusato", "config", "includes.installer")) -shutil.copytree(os.path.join(uchinanchu, "pephooks", "normal"), os.path.join(uchinanchu, "fusato", "config", "hooks", "normal"), dirs_exist_ok=True) -shutil.copytree(os.path.join(uchinanchu, "pepscripts"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "usr", "lib", "finish-install.d"), dirs_exist_ok=True) shutil.copy(os.path.join(uchinanchu, "pepsources", "multimedia.list"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "repos")) shutil.copy(os.path.join(uchinanchu, "pepsources", "peppermint.list"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "repos")) shutil.copy(os.path.join(uchinanchu, "pepsources", "sources.list"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "sources-final")) shutil.copy(os.path.join(uchinanchu, "pepsources", "sources.list"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "repos")) +shutil.copy(os.path.join(uchinanchu, "pepgrub", "grub"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "grub")) + +# Copy recursive files and sub-directories +shutil.copytree(os.path.join(uchinanchu, "pepscripts"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "usr", "lib", "finish-install.d"), dirs_exist_ok=True) +shutil.copytree(os.path.join(uchinanchu, "pephooks", "normal"), os.path.join(uchinanchu, "fusato", "config", "hooks", "normal"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "pepkeyrings"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "keyrings"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "polkit"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "polkit"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "pepapplication"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "apps"), dirs_exist_ok=True) @@ -85,8 +89,6 @@ shutil.copytree(os.path.join(uchinanchu, "PepProPixMaps"), os.path.join(uchinanc shutil.copytree(os.path.join(uchinanchu, "pepconf"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "conf"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "PepProTools"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "protools"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "peplightdm"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "lightdm"), dirs_exist_ok=True) - -# Copy recursive files and sub-directories shutil.copytree(os.path.join(uchinanchu, "peploadersplash", "debian"), os.path.join(uchinanchu, "fusato", "config", "includes.binary"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "pepinstaller"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "usr", "share"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "pepgrub", "debian"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "grub"), dirs_exist_ok=True) diff --git a/PepDeb64/pepbld.sh b/PepDeb64/pepbld.sh index 4cf27b8..d495702 100755 --- a/PepDeb64/pepbld.sh +++ b/PepDeb64/pepbld.sh @@ -77,6 +77,7 @@ cp $uchinanchu/PepProPixMaps/* $uchinanchu/fusato/config/includes.installer/pres cp $uchinanchu/pepconf/* $uchinanchu/fusato/config/includes.installer/preseed/conf cp $uchinanchu/PepProTools/* $uchinanchu/fusato/config/includes.installer/preseed/protools cp $uchinanchu/peplightdm/* $uchinanchu/fusato/config/includes.installer/preseed/lightdm +cp $uchinanchu/pepgrub/grub $uchinanchu/fusato/config/includes.installer/preseed/grub # Copy recursive files and sub-directories cp -r $uchinanchu/peploadersplash/debian/boot $uchinanchu/fusato/config/includes.binary diff --git a/PepDeb_arm64/pepbld.py b/PepDeb_arm64/pepbld.py index 5b45dd3..1d161c0 100644 --- a/PepDeb_arm64/pepbld.py +++ b/PepDeb_arm64/pepbld.py @@ -69,14 +69,18 @@ os.makedirs(os.path.join(uchinanchu, "fusato", "config", "includes.installer", " os.makedirs(os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "autostart"), exist_ok=True) os.makedirs(os.path.join(uchinanchu, "fusato", "config", "hooks", "normal"), exist_ok=True) + shutil.copy(os.path.join(uchinanchu, "pepautostart", "Welcome_auto.desktop"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "autostart")) shutil.copy(os.path.join(uchinanchu, "pepinstaller", "preseed", "preseed.cfg"), os.path.join(uchinanchu, "fusato", "config", "includes.installer")) -shutil.copytree(os.path.join(uchinanchu, "pephooks", "normal"), os.path.join(uchinanchu, "fusato", "config", "hooks", "normal"), dirs_exist_ok=True) -shutil.copytree(os.path.join(uchinanchu, "pepscripts"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "usr", "lib", "finish-install.d"), dirs_exist_ok=True) shutil.copy(os.path.join(uchinanchu, "pepsources", "multimedia.list"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "repos")) shutil.copy(os.path.join(uchinanchu, "pepsources", "peppermint.list"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "repos")) shutil.copy(os.path.join(uchinanchu, "pepsources", "sources.list"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "sources-final")) shutil.copy(os.path.join(uchinanchu, "pepsources", "sources.list"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "repos")) +shutil.copy(os.path.join(uchinanchu, "pepgrub", "grub"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "grub")) + +# Copy recursive files and sub-directories +shutil.copytree(os.path.join(uchinanchu, "pepscripts"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "usr", "lib", "finish-install.d"), dirs_exist_ok=True) +shutil.copytree(os.path.join(uchinanchu, "pephooks", "normal"), os.path.join(uchinanchu, "fusato", "config", "hooks", "normal"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "pepkeyrings"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "keyrings"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "polkit"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "polkit"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "pepapplication"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "apps"), dirs_exist_ok=True) @@ -85,8 +89,6 @@ shutil.copytree(os.path.join(uchinanchu, "PepProPixMaps"), os.path.join(uchinanc shutil.copytree(os.path.join(uchinanchu, "pepconf"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "conf"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "PepProTools"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "protools"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "peplightdm"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "lightdm"), dirs_exist_ok=True) - -# Copy recursive files and sub-directories shutil.copytree(os.path.join(uchinanchu, "peploadersplash", "debian"), os.path.join(uchinanchu, "fusato", "config", "includes.binary"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "pepinstaller"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "usr", "share"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "pepgrub", "debian"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "grub"), dirs_exist_ok=True) diff --git a/PepDeb_arm64/pepbld.sh b/PepDeb_arm64/pepbld.sh index ecc2e2e..53c14b9 100755 --- a/PepDeb_arm64/pepbld.sh +++ b/PepDeb_arm64/pepbld.sh @@ -79,6 +79,7 @@ cp $uchinanchu/PepProPixMaps/* $uchinanchu/fusato/config/includes.installer/pres cp $uchinanchu/pepconf/* $uchinanchu/fusato/config/includes.installer/preseed/conf cp $uchinanchu/PepProTools/* $uchinanchu/fusato/config/includes.installer/preseed/protools cp $uchinanchu/peplightdm/* $uchinanchu/fusato/config/includes.installer/preseed/lightdm +cp $uchinanchu/pepgrub/grub $uchinanchu/fusato/config/includes.installer/preseed/grub # Copy recursive files and sub-directories cp -r $uchinanchu/peploadersplash/debian/boot $uchinanchu/fusato/config/includes.binary diff --git a/PepDev32/pepbld.py b/PepDev32/pepbld.py index c0fac60..e6f9c32 100644 --- a/PepDev32/pepbld.py +++ b/PepDev32/pepbld.py @@ -82,14 +82,18 @@ os.makedirs(os.path.join(uchinanchu, "fusato", "config", "includes.installer", " os.makedirs(os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "autostart"), exist_ok=True) os.makedirs(os.path.join(uchinanchu, "fusato", "config", "hooks", "normal"), exist_ok=True) + shutil.copy(os.path.join(uchinanchu, "pepautostart", "Welcome_auto.desktop"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "autostart")) shutil.copy(os.path.join(uchinanchu, "pepinstaller", "preseed", "preseed.cfg"), os.path.join(uchinanchu, "fusato", "config", "includes.installer")) -shutil.copytree(os.path.join(uchinanchu, "pephooks", "normal"), os.path.join(uchinanchu, "fusato", "config", "hooks", "normal"), dirs_exist_ok=True) -shutil.copytree(os.path.join(uchinanchu, "pepscriptsdev"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "usr", "lib", "finish-install.d"), dirs_exist_ok=True) shutil.copy(os.path.join(uchinanchu, "pepsources", "multimedia.list"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "repos")) shutil.copy(os.path.join(uchinanchu, "pepsources", "peppermint.list"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "repos")) shutil.copy(os.path.join(uchinanchu, "pepsources", "sources.list"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "sources-final")) shutil.copy(os.path.join(uchinanchu, "pepsources", "sources.list"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "repos")) +shutil.copy(os.path.join(uchinanchu, "pepgrub", "grub"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "grub")) + +# Copy recursive files and sub-directories +shutil.copytree(os.path.join(uchinanchu, "pepscripts"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "usr", "lib", "finish-install.d"), dirs_exist_ok=True) +shutil.copytree(os.path.join(uchinanchu, "pephooks", "normal"), os.path.join(uchinanchu, "fusato", "config", "hooks", "normal"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "pepkeyrings"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "keyrings"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "polkit"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "polkit"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "pepapplication"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "apps"), dirs_exist_ok=True) @@ -98,8 +102,6 @@ shutil.copytree(os.path.join(uchinanchu, "PepProPixMaps"), os.path.join(uchinanc shutil.copytree(os.path.join(uchinanchu, "pepconf"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "conf"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "PepProTools"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "protools"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "peplightdm"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "lightdm"), dirs_exist_ok=True) - -# Copy recursive files and sub-directories shutil.copytree(os.path.join(uchinanchu, "peploadersplash", "devuan"), os.path.join(uchinanchu, "fusato", "config", "includes.binary"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "pepinstaller"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "usr", "share"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "pepgrub", "devuan"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "grub"), dirs_exist_ok=True) diff --git a/PepDev32/pepbld.sh b/PepDev32/pepbld.sh index 7f73696..7c3f61d 100755 --- a/PepDev32/pepbld.sh +++ b/PepDev32/pepbld.sh @@ -89,6 +89,7 @@ cp $uchinanchu/PepProPixMaps/* $uchinanchu/fusato/config/includes.installer/pres cp $uchinanchu/pepconf/* $uchinanchu/fusato/config/includes.installer/preseed/conf cp $uchinanchu/PepProTools/* $uchinanchu/fusato/config/includes.installer/preseed/protools cp $uchinanchu/peplightdm/* $uchinanchu/fusato/config/includes.installer/preseed/lightdm +cp $uchinanchu/pepgrub/grub $uchinanchu/fusato/config/includes.installer/preseed/grub # Copy recursive files and sub-directories cp -r $uchinanchu/peploadersplash/devuan/boot $uchinanchu/fusato/config/includes.binary diff --git a/PepDev64/pepbld.py b/PepDev64/pepbld.py index 7040738..20e2c0e 100644 --- a/PepDev64/pepbld.py +++ b/PepDev64/pepbld.py @@ -81,14 +81,18 @@ os.makedirs(os.path.join(uchinanchu, "fusato", "config", "includes.installer", " os.makedirs(os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "autostart"), exist_ok=True) os.makedirs(os.path.join(uchinanchu, "fusato", "config", "hooks", "normal"), exist_ok=True) + shutil.copy(os.path.join(uchinanchu, "pepautostart", "Welcome_auto.desktop"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "autostart")) shutil.copy(os.path.join(uchinanchu, "pepinstaller", "preseed", "preseed.cfg"), os.path.join(uchinanchu, "fusato", "config", "includes.installer")) -shutil.copytree(os.path.join(uchinanchu, "pephooks", "normal"), os.path.join(uchinanchu, "fusato", "config", "hooks", "normal"), dirs_exist_ok=True) -shutil.copytree(os.path.join(uchinanchu, "pepscriptsdev"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "usr", "lib", "finish-install.d"), dirs_exist_ok=True) shutil.copy(os.path.join(uchinanchu, "pepsources", "multimedia.list"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "repos")) shutil.copy(os.path.join(uchinanchu, "pepsources", "peppermint.list"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "repos")) shutil.copy(os.path.join(uchinanchu, "pepsources", "sources.list"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "sources-final")) shutil.copy(os.path.join(uchinanchu, "pepsources", "sources.list"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "repos")) +shutil.copy(os.path.join(uchinanchu, "pepgrub", "grub"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "grub")) + +# Copy recursive files and sub-directories +shutil.copytree(os.path.join(uchinanchu, "pepscripts"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "usr", "lib", "finish-install.d"), dirs_exist_ok=True) +shutil.copytree(os.path.join(uchinanchu, "pephooks", "normal"), os.path.join(uchinanchu, "fusato", "config", "hooks", "normal"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "pepkeyrings"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "keyrings"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "polkit"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "polkit"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "pepapplication"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "apps"), dirs_exist_ok=True) @@ -97,8 +101,6 @@ shutil.copytree(os.path.join(uchinanchu, "PepProPixMaps"), os.path.join(uchinanc shutil.copytree(os.path.join(uchinanchu, "pepconf"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "conf"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "PepProTools"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "protools"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "peplightdm"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "lightdm"), dirs_exist_ok=True) - -# Copy recursive files and sub-directories shutil.copytree(os.path.join(uchinanchu, "peploadersplash", "devuan"), os.path.join(uchinanchu, "fusato", "config", "includes.binary"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "pepinstaller"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "usr", "share"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "pepgrub", "devuan"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "grub"), dirs_exist_ok=True) diff --git a/PepDev64/pepbld.sh b/PepDev64/pepbld.sh index 35878fa..7d0289e 100755 --- a/PepDev64/pepbld.sh +++ b/PepDev64/pepbld.sh @@ -89,6 +89,7 @@ cp $uchinanchu/PepProPixMaps/* $uchinanchu/fusato/config/includes.installer/pres cp $uchinanchu/pepconf/* $uchinanchu/fusato/config/includes.installer/preseed/conf cp $uchinanchu/PepProTools/* $uchinanchu/fusato/config/includes.installer/preseed/protools cp $uchinanchu/peplightdm/* $uchinanchu/fusato/config/includes.installer/preseed/lightdm +cp $uchinanchu/pepgrub/grub $uchinanchu/fusato/config/includes.installer/preseed/grub # Copy recursive files and sub-directories cp -r $uchinanchu/peploadersplash/devuan/boot $uchinanchu/fusato/config/includes.binary diff --git a/PepDev_arm64/pepbld.py b/PepDev_arm64/pepbld.py index 7911bc7..460dd93 100644 --- a/PepDev_arm64/pepbld.py +++ b/PepDev_arm64/pepbld.py @@ -82,14 +82,18 @@ os.makedirs(os.path.join(uchinanchu, "fusato", "config", "includes.installer", " os.makedirs(os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "autostart"), exist_ok=True) os.makedirs(os.path.join(uchinanchu, "fusato", "config", "hooks", "normal"), exist_ok=True) + shutil.copy(os.path.join(uchinanchu, "pepautostart", "Welcome_auto.desktop"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "autostart")) shutil.copy(os.path.join(uchinanchu, "pepinstaller", "preseed", "preseed.cfg"), os.path.join(uchinanchu, "fusato", "config", "includes.installer")) -shutil.copytree(os.path.join(uchinanchu, "pephooks", "normal"), os.path.join(uchinanchu, "fusato", "config", "hooks", "normal"), dirs_exist_ok=True) -shutil.copytree(os.path.join(uchinanchu, "pepscriptsdev"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "usr", "lib", "finish-install.d"), dirs_exist_ok=True) shutil.copy(os.path.join(uchinanchu, "pepsources", "multimedia.list"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "repos")) shutil.copy(os.path.join(uchinanchu, "pepsources", "peppermint.list"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "repos")) shutil.copy(os.path.join(uchinanchu, "pepsources", "sources.list"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "sources-final")) shutil.copy(os.path.join(uchinanchu, "pepsources", "sources.list"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "repos")) +shutil.copy(os.path.join(uchinanchu, "pepgrub", "grub"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "grub")) + +# Copy recursive files and sub-directories +shutil.copytree(os.path.join(uchinanchu, "pepscripts"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "usr", "lib", "finish-install.d"), dirs_exist_ok=True) +shutil.copytree(os.path.join(uchinanchu, "pephooks", "normal"), os.path.join(uchinanchu, "fusato", "config", "hooks", "normal"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "pepkeyrings"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "keyrings"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "polkit"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "polkit"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "pepapplication"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "apps"), dirs_exist_ok=True) @@ -98,8 +102,6 @@ shutil.copytree(os.path.join(uchinanchu, "PepProPixMaps"), os.path.join(uchinanc shutil.copytree(os.path.join(uchinanchu, "pepconf"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "conf"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "PepProTools"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "protools"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "peplightdm"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "lightdm"), dirs_exist_ok=True) - -# Copy recursive files and sub-directories shutil.copytree(os.path.join(uchinanchu, "peploadersplash", "devuan"), os.path.join(uchinanchu, "fusato", "config", "includes.binary"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "pepinstaller"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "usr", "share"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "pepgrub", "devuan"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "grub"), dirs_exist_ok=True) diff --git a/PepDev_arm64/pepbld.sh b/PepDev_arm64/pepbld.sh index d0e7dd7..768de7d 100755 --- a/PepDev_arm64/pepbld.sh +++ b/PepDev_arm64/pepbld.sh @@ -92,6 +92,7 @@ cp $uchinanchu/PepProPixMaps/* $uchinanchu/fusato/config/includes.installer/pres cp $uchinanchu/pepconf/* $uchinanchu/fusato/config/includes.installer/preseed/conf cp $uchinanchu/PepProTools/* $uchinanchu/fusato/config/includes.installer/preseed/protools cp $uchinanchu/peplightdm/* $uchinanchu/fusato/config/includes.installer/preseed/lightdm +cp $uchinanchu/pepgrub/grub $uchinanchu/fusato/config/includes.installer/preseed/grub # Copy recursive files and sub-directories cp -r $uchinanchu/peploadersplash/devuan/boot $uchinanchu/fusato/config/includes.binary