diff --git a/PepDev32/pepbld.py b/PepDev32/pepbld.py index 50a4aa4..bf1f05c 100644 --- a/PepDev32/pepbld.py +++ b/PepDev32/pepbld.py @@ -91,8 +91,6 @@ shutil.copy(os.path.join(uchinanchu, "pepsources", "peppermint.list"), os.path.j 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")) -shutil.copy(os.path.join(uchinanchu, "pepinfo", "Devuan.info"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "info")) -shutil.copy(os.path.join(uchinanchu, "pepinfo", "Devuan.mirrors"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "info")) # 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) @@ -110,5 +108,6 @@ shutil.copytree(os.path.join(uchinanchu, "pepinstaller"), os.path.join(uchinanch shutil.copytree(os.path.join(uchinanchu, "pepgrub", "devuan"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "grub"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "pylibraries"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "py"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "pmostools"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "tools"), dirs_exist_ok=True) +shutil.copytree(os.path.join(uchinanchu, "pepinfo"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "info"), dirs_exist_ok=True) subprocess.run("lb build", shell=True) diff --git a/PepDev32/pepbld.sh b/PepDev32/pepbld.sh index 711a0fc..0da4d50 100755 --- a/PepDev32/pepbld.sh +++ b/PepDev32/pepbld.sh @@ -91,7 +91,7 @@ cp $uchinanchu/pepconf/* $uchinanchu/fusato/config/includes.installer/preseed/co 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 -cp $uchinanchu/pepinfo/*$uchinanchu/fusato/config/includes.installer/preseed/info +cp $uchinanchu/pepinfo/* $uchinanchu/fusato/config/includes.installer/preseed/info # 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 4f4c1c0..c8c0f66 100644 --- a/PepDev64/pepbld.py +++ b/PepDev64/pepbld.py @@ -89,9 +89,7 @@ shutil.copy(os.path.join(uchinanchu, "pepsources", "multimedia.list"), os.path.j 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")) -shutil.copy(os.path.join(uchinanchu, "pepinfo", "Devuan.info"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "info")) -shutil.copy(os.path.join(uchinanchu, "pepinfo", "Devuan.mirrors"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "info")) +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) @@ -109,5 +107,6 @@ shutil.copytree(os.path.join(uchinanchu, "pepinstaller"), os.path.join(uchinanch shutil.copytree(os.path.join(uchinanchu, "pepgrub", "devuan"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "grub"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "pylibraries"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "py"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "pmostools"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "tools"), dirs_exist_ok=True) +shutil.copytree(os.path.join(uchinanchu, "pepinfo"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "info"), dirs_exist_ok=True) subprocess.run("lb build", shell=True) diff --git a/PepDev64/pepbld.sh b/PepDev64/pepbld.sh index bf12bae..d9bcb04 100755 --- a/PepDev64/pepbld.sh +++ b/PepDev64/pepbld.sh @@ -91,7 +91,7 @@ cp $uchinanchu/pepconf/* $uchinanchu/fusato/config/includes.installer/preseed/co 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 -cp $uchinanchu/pepinfo/*$uchinanchu/fusato/config/includes.installer/preseed/info +cp $uchinanchu/pepinfo/* $uchinanchu/fusato/config/includes.installer/preseed/info # 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 3faabc3..197a631 100644 --- a/PepDev_arm64/pepbld.py +++ b/PepDev_arm64/pepbld.py @@ -94,8 +94,6 @@ shutil.copy(os.path.join(uchinanchu, "pepsources", "peppermint.list"), os.path.j 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")) -shutil.copy(os.path.join(uchinanchu, "pepinfo", "Devuan.info"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "info")) -shutil.copy(os.path.join(uchinanchu, "pepinfo", "Devuan.mirrors"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "info")) # 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) @@ -113,5 +111,6 @@ shutil.copytree(os.path.join(uchinanchu, "pepinstaller"), os.path.join(uchinanch shutil.copytree(os.path.join(uchinanchu, "pepgrub", "devuan"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "grub"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "pylibraries"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "py"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "pmostools"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "tools"), dirs_exist_ok=True) +shutil.copytree(os.path.join(uchinanchu, "pepinfo"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "info"), dirs_exist_ok=True) subprocess.run("lb build", shell=True) diff --git a/PepDev_arm64/pepbld.sh b/PepDev_arm64/pepbld.sh index 2761c98..6ac14f7 100755 --- a/PepDev_arm64/pepbld.sh +++ b/PepDev_arm64/pepbld.sh @@ -94,7 +94,7 @@ cp $uchinanchu/pepconf/* $uchinanchu/fusato/config/includes.installer/preseed/co 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 -cp $uchinanchu/pepinfo/*$uchinanchu/fusato/config/includes.installer/preseed/info +cp $uchinanchu/pepinfo/* $uchinanchu/fusato/config/includes.installer/preseed/info # Copy recursive files and sub-directories cp -r $uchinanchu/peploadersplash/devuan/boot $uchinanchu/fusato/config/includes.binary