diff --git a/PepDeb32/pepbld.sh b/PepDeb32/pepbld.sh index 5c8237a..3d98f36 100755 --- a/PepDeb32/pepbld.sh +++ b/PepDeb32/pepbld.sh @@ -165,7 +165,6 @@ cp $uchinanchu/pepapplication/* $uchinanchu/fusato/config/includes.installer/pre cp $uchinanchu/pepdatabase/* $uchinanchu/fusato/config/includes.installer/preseed/database cp $uchinanchu/PepProPixMaps/* $uchinanchu/fusato/config/includes.installer/preseed/pixmaps cp $uchinanchu/pepconf/* $uchinanchu/fusato/config/includes.installer/preseed/conf -cp $uchinanchu/pmostools/* $uchinanchu/fusato/config/includes.installer/preseed/tools cp $uchinanchu/PepProTools/* $uchinanchu/fusato/config/includes.installer/preseed/protools # Copy recursive files and sub-directories @@ -176,5 +175,6 @@ cp -r $uchinanchu/pepinstaller/themes $uchinanchu/fusato/config/includes.install cp -r $uchinanchu/pepgrub/* $uchinanchu/fusato/config/includes.installer/preseed/grub cp -r $uchinanchu/pepgrub/themes $uchinanchu/fusato/config/includes.installer/preseed/grub-themes cp -r $uchinanchu/pylibraries/* $uchinanchu/fusato/config/includes.installer/preseed/py +cp -r $uchinanchu/pmostools/* $uchinanchu/fusato/config/includes.installer/preseed/tools lb build diff --git a/PepDeb64/pepbld.sh b/PepDeb64/pepbld.sh index 44e4e4b..61d5e8a 100755 --- a/PepDeb64/pepbld.sh +++ b/PepDeb64/pepbld.sh @@ -164,7 +164,6 @@ cp $uchinanchu/pepapplication/* $uchinanchu/fusato/config/includes.installer/pre cp $uchinanchu/pepdatabase/* $uchinanchu/fusato/config/includes.installer/preseed/database cp $uchinanchu/PepProPixMaps/* $uchinanchu/fusato/config/includes.installer/preseed/pixmaps cp $uchinanchu/pepconf/* $uchinanchu/fusato/config/includes.installer/preseed/conf -cp $uchinanchu/pmostools/* $uchinanchu/fusato/config/includes.installer/preseed/tools cp $uchinanchu/PepProTools/* $uchinanchu/fusato/config/includes.installer/preseed/protools # Copy recursive files and sub-directories @@ -175,5 +174,6 @@ cp -r $uchinanchu/pepinstaller/themes $uchinanchu/fusato/config/includes.install cp -r $uchinanchu/pepgrub/* $uchinanchu/fusato/config/includes.installer/preseed/grub cp -r $uchinanchu/pepgrub/themes $uchinanchu/fusato/config/includes.installer/preseed/grub-themes cp -r $uchinanchu/pylibraries/* $uchinanchu/fusato/config/includes.installer/preseed/py +cp -r $uchinanchu/pmostools/* $uchinanchu/fusato/config/includes.installer/preseed/tools lb build diff --git a/PepDeb_arm64/pepbld.sh b/PepDeb_arm64/pepbld.sh index 37441a7..3944b01 100755 --- a/PepDeb_arm64/pepbld.sh +++ b/PepDeb_arm64/pepbld.sh @@ -167,7 +167,6 @@ cp $uchinanchu/pepapplication/* $uchinanchu/fusato/config/includes.installer/pre cp $uchinanchu/pepdatabase/* $uchinanchu/fusato/config/includes.installer/preseed/database cp $uchinanchu/PepProPixMaps/* $uchinanchu/fusato/config/includes.installer/preseed/pixmaps cp $uchinanchu/pepconf/* $uchinanchu/fusato/config/includes.installer/preseed/conf -cp $uchinanchu/pmostools/* $uchinanchu/fusato/config/includes.installer/preseed/tools cp $uchinanchu/PepProTools/* $uchinanchu/fusato/config/includes.installer/preseed/protools # Copy recursive files and sub-directories @@ -178,5 +177,6 @@ cp -r $uchinanchu/pepinstaller/themes $uchinanchu/fusato/config/includes.install cp -r $uchinanchu/pepgrub/* $uchinanchu/fusato/config/includes.installer/preseed/grub cp -r $uchinanchu/pepgrub/themes $uchinanchu/fusato/config/includes.installer/preseed/grub-themes cp -r $uchinanchu/pylibraries/* $uchinanchu/fusato/config/includes.installer/preseed/py +cp -r $uchinanchu/pmostools/* $uchinanchu/fusato/config/includes.installer/preseed/tools lb build diff --git a/PepDev32/pepbld.sh b/PepDev32/pepbld.sh index 294de90..b1ab69e 100755 --- a/PepDev32/pepbld.sh +++ b/PepDev32/pepbld.sh @@ -168,7 +168,7 @@ mkdir -p $uchinanchu/fusato/config/hooks/normal #cp $uchinanchu/peprepo/* $uchinanchu/fusato/config/archives cp $uchinanchu/pepinstaller/preseed/preseed.cfg $uchinanchu/fusato/config/includes.installer cp $uchinanchu/pephooks/normal/* $uchinanchu/fusato/config/hooks/normal -cp $uchinanchu/pepscripts/* $uchinanchu/fusato/config/includes.installer/preseed/scripts +cp $uchinanchu/pepscriptsdev/* $uchinanchu/fusato/config/includes.installer/preseed/scripts cp $uchinanchu/pepsources/multimedia.list $uchinanchu/fusato/config/includes.installer/preseed/repos cp $uchinanchu/pepsources/peppermint.list $uchinanchu/fusato/config/includes.installer/preseed/repos cp $uchinanchu/pepsources/sources.list $uchinanchu/fusato/config/includes.installer/preseed/sources-final @@ -178,7 +178,6 @@ cp $uchinanchu/pepapplication/* $uchinanchu/fusato/config/includes.installer/pre cp $uchinanchu/pepdatabase/* $uchinanchu/fusato/config/includes.installer/preseed/database cp $uchinanchu/PepProPixMaps/* $uchinanchu/fusato/config/includes.installer/preseed/pixmaps cp $uchinanchu/pepconf/* $uchinanchu/fusato/config/includes.installer/preseed/conf -cp $uchinanchu/pmostools/* $uchinanchu/fusato/config/includes.installer/preseed/tools cp $uchinanchu/PepProTools/* $uchinanchu/fusato/config/includes.installer/preseed/protools # Copy recursive files and sub-directories @@ -189,5 +188,6 @@ cp -r $uchinanchu/pepinstaller/themes $uchinanchu/fusato/config/includes.install cp -r $uchinanchu/pepgrub/* $uchinanchu/fusato/config/includes.installer/preseed/grub cp -r $uchinanchu/pepgrub/themes $uchinanchu/fusato/config/includes.installer/preseed/grub-themes cp -r $uchinanchu/pylibraries/* $uchinanchu/fusato/config/includes.installer/preseed/py +cp -r $uchinanchu/pmostools/* $uchinanchu/fusato/config/includes.installer/preseed/tools lb build diff --git a/PepDev32/pepscripts/copy-files-to-chroot.sh b/PepDev32/pepscripts/copy-files-to-chroot.sh deleted file mode 100755 index 5d6e7ad..0000000 --- a/PepDev32/pepscripts/copy-files-to-chroot.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -# SPDX-License-Identifier: GPL-3.0-or-later -# -# SPDX-FileCopyrightText: 2023 PeppemrintOS Team (peppermintosteam@proton.me) - -# This script copies a file to the chroot and runs commands during the Debian installation process. - - -# Copy files to the chroot directory -echo "Copying files to chroot..." -cp /preseed/grub /target/etc/default -cp /preseed/multimedia.list /target/etc/apt/sources.list.d -cp /preseed/peppermint.list /target/etc/apt/sources.list.d -cp /preseed/sources.list /target/etc/apt -cp /preseed/deb-multimedia-keyring.gpg /target/etc/apt/trusted.gpg.d -cp /preseed/peppermint-keyring.gpg /target/etc/apt/trusted.gpg.d -cp /preseed/deb-multimedia-keyring.gpg /target/usr/share/keyrings -cp /preseed/peppermint-keyring.gpg /target/usr/share/keyrings -cp -r /preseed/themes /target/boot/grub - -# Run a commands in the chroot -chroot /target update-initramfs -u -chroot /target update-grub -cd /target//usr/share/python-apt/templates/ -ln -s Devuan.info Peppermint.info -ln -s Devuan.mirrors Peppermint.mirrors -cd /target/usr/share/distro-info/ -ln -s devuan.csv peppermint.csv - -exit - diff --git a/PepDev32/pepscriptsdev b/PepDev32/pepscriptsdev new file mode 120000 index 0000000..e5fb431 --- /dev/null +++ b/PepDev32/pepscriptsdev @@ -0,0 +1 @@ +../pepscriptsdev \ No newline at end of file diff --git a/PepDev64/pepbld.sh b/PepDev64/pepbld.sh index e01ada7..21c1bec 100755 --- a/PepDev64/pepbld.sh +++ b/PepDev64/pepbld.sh @@ -166,7 +166,7 @@ mkdir -p $uchinanchu/fusato/config/hooks/normal #cp $uchinanchu/peprepo/* $uchinanchu/fusato/config/archives cp $uchinanchu/pepinstaller/preseed/preseed.cfg $uchinanchu/fusato/config/includes.installer cp $uchinanchu/pephooks/normal/* $uchinanchu/fusato/config/hooks/normal -cp $uchinanchu/pepscripts/* $uchinanchu/fusato/config/includes.installer/preseed/scripts +cp $uchinanchu/pepscriptsdev/* $uchinanchu/fusato/config/includes.installer/preseed/scripts cp $uchinanchu/pepsources/multimedia.list $uchinanchu/fusato/config/includes.installer/preseed/repos cp $uchinanchu/pepsources/peppermint.list $uchinanchu/fusato/config/includes.installer/preseed/repos cp $uchinanchu/pepsources/sources.list $uchinanchu/fusato/config/includes.installer/preseed/sources-final @@ -176,7 +176,6 @@ cp $uchinanchu/pepapplication/* $uchinanchu/fusato/config/includes.installer/pre cp $uchinanchu/pepdatabase/* $uchinanchu/fusato/config/includes.installer/preseed/database cp $uchinanchu/PepProPixMaps/* $uchinanchu/fusato/config/includes.installer/preseed/pixmaps cp $uchinanchu/pepconf/* $uchinanchu/fusato/config/includes.installer/preseed/conf -cp $uchinanchu/pmostools/* $uchinanchu/fusato/config/includes.installer/preseed/tools cp $uchinanchu/PepProTools/* $uchinanchu/fusato/config/includes.installer/preseed/protools # Copy recursive files and sub-directories @@ -187,5 +186,6 @@ cp -r $uchinanchu/pepinstaller/themes $uchinanchu/fusato/config/includes.install cp -r $uchinanchu/pepgrub/* $uchinanchu/fusato/config/includes.installer/preseed/grub cp -r $uchinanchu/pepgrub/themes $uchinanchu/fusato/config/includes.installer/preseed/grub-themes cp -r $uchinanchu/pylibraries/* $uchinanchu/fusato/config/includes.installer/preseed/py +cp -r $uchinanchu/pmostools/* $uchinanchu/fusato/config/includes.installer/preseed/tools lb build diff --git a/PepDev64/pepscripts/copy-files-to-chroot.sh b/PepDev64/pepscripts/copy-files-to-chroot.sh deleted file mode 100755 index 5d6e7ad..0000000 --- a/PepDev64/pepscripts/copy-files-to-chroot.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -# SPDX-License-Identifier: GPL-3.0-or-later -# -# SPDX-FileCopyrightText: 2023 PeppemrintOS Team (peppermintosteam@proton.me) - -# This script copies a file to the chroot and runs commands during the Debian installation process. - - -# Copy files to the chroot directory -echo "Copying files to chroot..." -cp /preseed/grub /target/etc/default -cp /preseed/multimedia.list /target/etc/apt/sources.list.d -cp /preseed/peppermint.list /target/etc/apt/sources.list.d -cp /preseed/sources.list /target/etc/apt -cp /preseed/deb-multimedia-keyring.gpg /target/etc/apt/trusted.gpg.d -cp /preseed/peppermint-keyring.gpg /target/etc/apt/trusted.gpg.d -cp /preseed/deb-multimedia-keyring.gpg /target/usr/share/keyrings -cp /preseed/peppermint-keyring.gpg /target/usr/share/keyrings -cp -r /preseed/themes /target/boot/grub - -# Run a commands in the chroot -chroot /target update-initramfs -u -chroot /target update-grub -cd /target//usr/share/python-apt/templates/ -ln -s Devuan.info Peppermint.info -ln -s Devuan.mirrors Peppermint.mirrors -cd /target/usr/share/distro-info/ -ln -s devuan.csv peppermint.csv - -exit - diff --git a/PepDev64/pepscriptsdev b/PepDev64/pepscriptsdev new file mode 120000 index 0000000..e5fb431 --- /dev/null +++ b/PepDev64/pepscriptsdev @@ -0,0 +1 @@ +../pepscriptsdev \ No newline at end of file diff --git a/PepDev_arm64/pepbld.sh b/PepDev_arm64/pepbld.sh index c849040..4dabe62 100755 --- a/PepDev_arm64/pepbld.sh +++ b/PepDev_arm64/pepbld.sh @@ -170,7 +170,7 @@ mkdir -p $uchinanchu/fusato/config/hooks/normal #cp $uchinanchu/peprepo/* $uchinanchu/fusato/config/archives cp $uchinanchu/pepinstaller/preseed/preseed.cfg $uchinanchu/fusato/config/includes.installer cp $uchinanchu/pephooks/normal/* $uchinanchu/fusato/config/hooks/normal -cp $uchinanchu/pepscripts/* $uchinanchu/fusato/config/includes.installer/preseed/scripts +cp $uchinanchu/pepscriptsdev/* $uchinanchu/fusato/config/includes.installer/preseed/scripts cp $uchinanchu/pepsources/multimedia.list $uchinanchu/fusato/config/includes.installer/preseed/repos cp $uchinanchu/pepsources/peppermint.list $uchinanchu/fusato/config/includes.installer/preseed/repos cp $uchinanchu/pepsources/sources.list $uchinanchu/fusato/config/includes.installer/preseed/sources-final @@ -180,7 +180,6 @@ cp $uchinanchu/pepapplication/* $uchinanchu/fusato/config/includes.installer/pre cp $uchinanchu/pepdatabase/* $uchinanchu/fusato/config/includes.installer/preseed/database cp $uchinanchu/PepProPixMaps/* $uchinanchu/fusato/config/includes.installer/preseed/pixmaps cp $uchinanchu/pepconf/* $uchinanchu/fusato/config/includes.installer/preseed/conf -cp $uchinanchu/pmostools/* $uchinanchu/fusato/config/includes.installer/preseed/tools cp $uchinanchu/PepProTools/* $uchinanchu/fusato/config/includes.installer/preseed/protools # Copy recursive files and sub-directories @@ -191,5 +190,6 @@ cp -r $uchinanchu/pepinstaller/themes $uchinanchu/fusato/config/includes.install cp -r $uchinanchu/pepgrub/* $uchinanchu/fusato/config/includes.installer/preseed/grub cp -r $uchinanchu/pepgrub/themes $uchinanchu/fusato/config/includes.installer/preseed/grub-themes cp -r $uchinanchu/pylibraries/* $uchinanchu/fusato/config/includes.installer/preseed/py +cp -r $uchinanchu/pmostools/* $uchinanchu/fusato/config/includes.installer/preseed/tools lb build diff --git a/PepDev_arm64/pepscripts/copy-files-to-chroot.sh b/PepDev_arm64/pepscripts/copy-files-to-chroot.sh deleted file mode 100755 index 5d6e7ad..0000000 --- a/PepDev_arm64/pepscripts/copy-files-to-chroot.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -# SPDX-License-Identifier: GPL-3.0-or-later -# -# SPDX-FileCopyrightText: 2023 PeppemrintOS Team (peppermintosteam@proton.me) - -# This script copies a file to the chroot and runs commands during the Debian installation process. - - -# Copy files to the chroot directory -echo "Copying files to chroot..." -cp /preseed/grub /target/etc/default -cp /preseed/multimedia.list /target/etc/apt/sources.list.d -cp /preseed/peppermint.list /target/etc/apt/sources.list.d -cp /preseed/sources.list /target/etc/apt -cp /preseed/deb-multimedia-keyring.gpg /target/etc/apt/trusted.gpg.d -cp /preseed/peppermint-keyring.gpg /target/etc/apt/trusted.gpg.d -cp /preseed/deb-multimedia-keyring.gpg /target/usr/share/keyrings -cp /preseed/peppermint-keyring.gpg /target/usr/share/keyrings -cp -r /preseed/themes /target/boot/grub - -# Run a commands in the chroot -chroot /target update-initramfs -u -chroot /target update-grub -cd /target//usr/share/python-apt/templates/ -ln -s Devuan.info Peppermint.info -ln -s Devuan.mirrors Peppermint.mirrors -cd /target/usr/share/distro-info/ -ln -s devuan.csv peppermint.csv - -exit - diff --git a/PepDev_arm64/pepscriptsdev b/PepDev_arm64/pepscriptsdev new file mode 120000 index 0000000..e5fb431 --- /dev/null +++ b/PepDev_arm64/pepscriptsdev @@ -0,0 +1 @@ +../pepscriptsdev \ No newline at end of file diff --git a/pepscripts/copy-files-to-chroot.sh b/pepscripts/copy-files-to-chroot.sh index 5c116cf..e450abf 100755 --- a/pepscripts/copy-files-to-chroot.sh +++ b/pepscripts/copy-files-to-chroot.sh @@ -27,9 +27,10 @@ cp /preseed/keyrings/peppermint-keyring.gpg /target/usr/share/keyrings cp /preseed/database/* /target/opt/pypep/dbpep cp /preseed/polkit/* /target/usr/share/polkit-1/actions cp /preseed/pixmaps/* /target/usr/share/pixmaps -cp /preseed/protools/* /target/usr/local/bin + # Copy recursive files and sub-directories +cp -r /preseed/protools/* /target/usr/local/bin cp -r /preseed/py/* /target/usr/lib/python3/dist-packages cp -r /preseed/grub-themes/themes /target/boot/grub cp -r /preseed/tools* /target/etc/skel/.local/share/pmostools @@ -50,5 +51,13 @@ chmod 777 pepicons chmod 777 pepthemes chmod 777 pepwallpaper +# Install hblock +in-target /bin/bash -c curl -o /tmp/hblock 'https://raw.githubusercontent.com/hectorm/hblock/v3.4.1/hblock' \ + && echo 'bb1f6fcafdcba6f7bd9e12613fc92b02a0a0da1263b0e44d209cb40d8715d647 /tmp/hblock' | shasum -c \ + && sudo mv /tmp/hblock /usr/local/bin/hblock \ + && sudo chown 0:0 /usr/local/bin/hblock \ + && sudo chmod 755 /usr/local/bin/hblock + + exit 0 diff --git a/pepscriptsdev/copy-files-to-chroot.sh b/pepscriptsdev/copy-files-to-chroot.sh new file mode 100755 index 0000000..22266c0 --- /dev/null +++ b/pepscriptsdev/copy-files-to-chroot.sh @@ -0,0 +1,63 @@ +#!/bin/bash + +# SPDX-License-Identifier: GPL-3.0-or-later +# +# SPDX-FileCopyrightText: 2023 PeppemrintOS Team (peppermintosteam@proton.me) + +# This script copies a file to the chroot and runs commands during the Debian installation process. + + +# setup a folder structure +mkdir /target/etc/skel/.local/share/pmostools +mkdir /target/opt/pepconf +mkdir /target/opt/pypep/dbpep + + +# Copy files to the chroot directory +echo "Copying files to chroot..." +cp /preseed/grub/grub /target/etc/default +cp /preseed/apps/* /target/usr/share/applications +cp /preseed/repos/multimedia.list /target/etc/apt/sources.list.d +cp /preseed/repos/peppermint.list /target/etc/apt/sources.list.d +cp /preseed/repos/sources.list /target/etc/apt +cp /preseed/conf/* /target/opt/pepconf +cp /preseed/keyrings/deb-multimedia-keyring.gpg /target/etc/apt/trusted.gpg.d +cp /preseed/keyrings/peppermint-keyring.gpg /target/etc/apt/trusted.gpg.d +cp /preseed/keyrings/deb-multimedia-keyring.gpg /target/usr/share/keyrings +cp /preseed/keyrings/peppermint-keyring.gpg /target/usr/share/keyrings +cp /preseed/database/* /target/opt/pypep/dbpep +cp /preseed/polkit/* /target/usr/share/polkit-1/actions +cp /preseed/pixmaps/* /target/usr/share/pixmaps + + +# Copy recursive files and sub-directories +cp -r /preseed/protools/* /target/usr/local/bin +cp -r /preseed/py/* /target/usr/lib/python3/dist-packages +cp -r /preseed/grub-themes/themes /target/boot/grub +cp -r /preseed/tools* /target/etc/skel/.local/share/pmostools + +# Run a commands in the chroot +chroot /target update-initramfs -u +chroot /target update-grub +cd /target//usr/share/python-apt/templates/ +ln -s Devuan.info Peppermint.info +ln -s Devuan.mirrors Peppermint.mirrors +cd /target/usr/share/distro-info/ +ln -s devuan.csv peppermint.csv +cd /target/usr/share/ +ln -s -r icons pepicons +ln -s -r themes pepthemes +ls -s -r backgrounds pepwallpaper +chmod 777 pepicons +chmod 777 pepthemes +chmod 777 pepwallpaper + +# Install hblock +in-target /bin/bash -c curl -o /tmp/hblock 'https://raw.githubusercontent.com/hectorm/hblock/v3.4.1/hblock' \ + && echo 'bb1f6fcafdcba6f7bd9e12613fc92b02a0a0da1263b0e44d209cb40d8715d647 /tmp/hblock' | shasum -c \ + && sudo mv /tmp/hblock /usr/local/bin/hblock \ + && sudo chown 0:0 /usr/local/bin/hblock \ + && sudo chmod 755 /usr/local/bin/hblock + +exit 0 +