From 7170ffa0e3e4531839a6c486f24d8dea3bdca536 Mon Sep 17 00:00:00 2001 From: Manuel Date: Sat, 17 Jun 2023 19:06:58 +0000 Subject: [PATCH] update build scripts --- .../acorhooks/normal/0520-applications.hook.chroot | 2 +- Budgie/build.sh | 5 +++-- .../acorhooks/normal/0520-applications.hook.chroot | 2 +- Cinnamon/build.sh | 6 ++++-- Gnome/acorhooks/normal/0520-applications.hook.chroot | 2 +- Gnome/build.sh | 7 +++++-- Kde/acorhooks/normal/0520-applications.hook.chroot | 2 +- Kde/build.sh | 11 +++++++---- Lxde/acorhooks/normal/0520-applications.hook.chroot | 2 +- Lxde/build.sh | 5 +++-- .../acorhooks/normal/0520-applications.hook.chroot | 2 +- Lxde32/build.sh | 5 +++-- Lxqt/acorhooks/normal/0520-applications.hook.chroot | 2 +- Lxqt/build.sh | 8 +++++--- .../acorhooks/normal/0520-applications.hook.chroot | 2 +- Lxqt32/build.sh | 12 ++++++------ Mate/acorhooks/normal/0520-applications.hook.chroot | 2 +- Mate/build.sh | 6 +++--- Xfce/acorhooks/normal/0520-applications.hook.chroot | 2 +- Xfce/build.sh | 5 +++-- .../acorhooks/normal/0520-applications.hook.chroot | 2 +- Xfce32/build.sh | 6 +++--- 22 files changed, 56 insertions(+), 42 deletions(-) diff --git a/Budgie/acorhooks/normal/0520-applications.hook.chroot b/Budgie/acorhooks/normal/0520-applications.hook.chroot index 4f5b576..8655288 100755 --- a/Budgie/acorhooks/normal/0520-applications.hook.chroot +++ b/Budgie/acorhooks/normal/0520-applications.hook.chroot @@ -6,7 +6,7 @@ # Remove software # apt remove -y firefox-esr # apt remove -y termit -apt --purge --yes autoremove murrine-themes hv3 libsqlite3-tcl libtcl8.6 libtk-img libtk8.6 tcl tcl-tls tcl8.6 tcllib tk tk-html3 tk8.6 konsole evolution nvidia-tesla-470-alternative termit raspi-firmware +apt --purge --yes autoremove murrine-themes hv3 libsqlite3-tcl libtcl8.6 libtk-img libtk8.6 tcl tcl-tls tcl8.6 tcllib tk tk-html3 tk8.6 konsole evolution termit raspi-firmware ## This section is the "lint-trap" to remove files and/or ## directories not associated with or required by AcorOS. diff --git a/Budgie/build.sh b/Budgie/build.sh index ebf74a0..99e1174 100755 --- a/Budgie/build.sh +++ b/Budgie/build.sh @@ -211,7 +211,6 @@ mkdir -p $acorbuild/build/config/archives mkdir -p $acorbuild/build/config/includes.binary mkdir -p $acorbuild/build/config/hooks/live mkdir -p $acorbuild/build/config/hooks/normal -mkdir -p $acorbuild/build/config/bootloaders mkdir -p $acorbuild/build/config/includes.chroot/usr/share/applications mkdir -p $acorbuild/build/config/includes.chroot/etc/live/config.conf.d mkdir -p $acorbuild/build/config/includes.chroot/usr/share/distro-info @@ -222,6 +221,8 @@ mkdir -p $acorbuild/build/config/includes.chroot/usr/local/bin mkdir -p $acorbuild/build/config/includes.chroot/etc/lightdm mkdir -p $acorbuild/build/config/includes.chroot/boot/grub mkdir -p $acorbuild/build/config/includes.chroot/etc/default +mkdir -p $acorbuild/build/config/includes.chroot/boot/grub +mkdir -p $uchinanchu/fusato/config/includes.binary # Copy Configs to the chroot cp $acorbuild/acoruserconfig/* $acorbuild/build/config/includes.chroot/etc/live/config.conf.d @@ -231,7 +232,7 @@ cp $acorbuild/acorhooks/normal/* $acorbuild/build/config/hooks/normal cp $acorbuild/acorlightdm/* $acorbuild/build/config/includes.chroot/etc/lightdm cp $acorbuild/acorgrub/grub $acorbuild/build/config/includes.chroot/etc/default -cp -r $acorbuild/acorbootloaders/* $acorbuild/build/config/bootloaders +cp -r $acorbuild/acorbootloaders/* $acorbuild/build/config/includes.binary cp -r $acorbuild/acorrepos/* $acorbuild/build/config/archives cp -r $acorbuild/acorcsv/* $acorbuild/build/config/includes.chroot/usr/share/distro-info cp -r $acorbuild/acorgrub/themes $acorbuild/build/config/includes.chroot/boot/grub diff --git a/Cinnamon/acorhooks/normal/0520-applications.hook.chroot b/Cinnamon/acorhooks/normal/0520-applications.hook.chroot index eac743f..10d7a95 100755 --- a/Cinnamon/acorhooks/normal/0520-applications.hook.chroot +++ b/Cinnamon/acorhooks/normal/0520-applications.hook.chroot @@ -6,7 +6,7 @@ # Remove software # apt remove -y firefox-esr # apt remove -y termit -apt --purge --yes autoremove vim vim-tiny nautilus murrine-themes hv3 inkscape gnome-control-center gnome-control-center-data gnome-system-monitor malcontent konsole nvidia-tesla-470-alternative termit raspi-firmware +apt --purge --yes autoremove vim vim-tiny nautilus murrine-themes hv3 inkscape gnome-control-center gnome-control-center-data gnome-system-monitor malcontent konsole termit raspi-firmware ## This section is the "lint-trap" to remove files and/or ## directories not associated with or required by AcorOS. ## Followed by \ , add files to be removed, one per line. diff --git a/Cinnamon/build.sh b/Cinnamon/build.sh index a609308..a7a38cd 100755 --- a/Cinnamon/build.sh +++ b/Cinnamon/build.sh @@ -213,7 +213,6 @@ mkdir -p $acorbuild/build/config/archives mkdir -p $acorbuild/build/config/includes.binary mkdir -p $acorbuild/build/config/hooks/live mkdir -p $acorbuild/build/config/hooks/normal -mkdir -p $acorbuild/build/config/bootloaders mkdir -p $acorbuild/build/config/includes.chroot/usr/share/applications mkdir -p $acorbuild/build/config/includes.chroot/etc/live/config.conf.d mkdir -p $acorbuild/build/config/includes.chroot/usr/share/distro-info @@ -224,6 +223,8 @@ mkdir -p $acorbuild/build/config/includes.chroot/usr/local/bin mkdir -p $acorbuild/build/config/includes.chroot/etc/lightdm mkdir -p $acorbuild/build/config/includes.chroot/boot/grub mkdir -p $acorbuild/build/config/includes.chroot/etc/default +mkdir -p $acorbuild/build/config/includes.chroot/boot/grub +mkdir -p $uchinanchu/fusato/config/includes.binary # Copy Configs to the chroot cp $acorbuild/acoruserconfig/* $acorbuild/build/config/includes.chroot/etc/live/config.conf.d @@ -231,8 +232,9 @@ cp $acorbuild/acorapplication/* $acorbuild/build/config/includes.chroot/usr/shar cp $acorbuild/acorhooks/live/* $acorbuild/build/config/hooks/live cp $acorbuild/acorhooks/normal/* $acorbuild/build/config/hooks/normal cp $acorbuild/acorlightdm/* $acorbuild/build/config/includes.chroot/etc/lightdm +cp $acorbuild/acorgrub/grub $acorbuild/build/config/includes.chroot/etc/default -cp -r $acorbuild/acorbootloaders/* $acorbuild/build/config/bootloaders +cp -r $acorbuild/acorbootloaders/* $acorbuild/build/config/includes.binary cp -r $acorbuild/acorrepos/* $acorbuild/build/config/archives cp -r $acorbuild/acorcsv/* $acorbuild/build/config/includes.chroot/usr/share/distro-info cp -r $acorbuild/acorgrub/themes $acorbuild/build/config/includes.chroot/boot/grub diff --git a/Gnome/acorhooks/normal/0520-applications.hook.chroot b/Gnome/acorhooks/normal/0520-applications.hook.chroot index 8375824..d33cbe5 100755 --- a/Gnome/acorhooks/normal/0520-applications.hook.chroot +++ b/Gnome/acorhooks/normal/0520-applications.hook.chroot @@ -6,7 +6,7 @@ # Remove software # apt remove -y firefox-esr # apt remove -y termit -apt --purge --yes autoremove murrine-themes hv3 libsqlite3-tcl libtcl8.6 libtk-img libtk8.6 tcl tcl-tls tcl8.6 tcllib tk tk-html3 tk8.6 konsole evolution nvidia-tesla-470-alternative termit raspi-firmware +apt --purge --yes autoremove murrine-themes hv3 libsqlite3-tcl libtcl8.6 libtk-img libtk8.6 tcl tcl-tls tcl8.6 tcllib tk tk-html3 tk8.6 konsole evolution termit raspi-firmware ## This section is the "lint-trap" to remove files and/or ## directories not associated with or required by AcorOS. diff --git a/Gnome/build.sh b/Gnome/build.sh index ce71532..eeca137 100755 --- a/Gnome/build.sh +++ b/Gnome/build.sh @@ -207,7 +207,6 @@ mkdir -p $acorbuild/build/config/archives mkdir -p $acorbuild/build/config/includes.binary mkdir -p $acorbuild/build/config/hooks/live mkdir -p $acorbuild/build/config/hooks/normal -mkdir -p $acorbuild/build/config/bootloaders mkdir -p $acorbuild/build/config/includes.chroot/usr/share/applications mkdir -p $acorbuild/build/config/includes.chroot/etc/live/config.conf.d mkdir -p $acorbuild/build/config/includes.chroot/usr/share/distro-info @@ -215,17 +214,21 @@ mkdir -p $acorbuild/build/config/includes.chroot//usr/share/python-apt/templates mkdir -p $acorbuild/build/config/includes.chroot/etc/dpkg/origins mkdir -p $acorbuild/build/config/includes.chroot/usr/bin mkdir -p $acorbuild/build/config/includes.chroot/usr/local/bin +mkdir -p $acorbuild/build/config/includes.chroot/etc/lightdm mkdir -p $acorbuild/build/config/includes.chroot/boot/grub mkdir -p $acorbuild/build/config/includes.chroot/etc/default +mkdir -p $acorbuild/build/config/includes.chroot/boot/grub +mkdir -p $uchinanchu/fusato/config/includes.binary # Copy Configs to the chroot cp $acorbuild/acoruserconfig/* $acorbuild/build/config/includes.chroot/etc/live/config.conf.d cp $acorbuild/acorapplication/* $acorbuild/build/config/includes.chroot/usr/share/applications cp $acorbuild/acorhooks/live/* $acorbuild/build/config/hooks/live cp $acorbuild/acorhooks/normal/* $acorbuild/build/config/hooks/normal +cp $acorbuild/acorlightdm/* $acorbuild/build/config/includes.chroot/etc/lightdm cp $acorbuild/acorgrub/grub $acorbuild/build/config/includes.chroot/etc/default -cp -r $acorbuild/acorbootloaders/* $acorbuild/build/config/bootloaders +cp -r $acorbuild/acorbootloaders/* $acorbuild/build/config/includes.binary cp -r $acorbuild/acorrepos/* $acorbuild/build/config/archives cp -r $acorbuild/acorcsv/* $acorbuild/build/config/includes.chroot/usr/share/distro-info cp -r $acorbuild/acorgrub/themes $acorbuild/build/config/includes.chroot/boot/grub diff --git a/Kde/acorhooks/normal/0520-applications.hook.chroot b/Kde/acorhooks/normal/0520-applications.hook.chroot index 3af3ef9..1369669 100755 --- a/Kde/acorhooks/normal/0520-applications.hook.chroot +++ b/Kde/acorhooks/normal/0520-applications.hook.chroot @@ -6,7 +6,7 @@ # Remove software # apt remove -y firefox-esr # apt remove -y teit -apt --purge --yes autoremove vim vim-tiny murrine-themes adapta-kde cantata hv3 nvidia-tesla-470-alternative termit raspi-firmware +apt --purge --yes autoremove vim vim-tiny murrine-themes adapta-kde cantata hv3 termit raspi-firmware ## This section is the "lint-trap" to remove files and/or ## directories not associated with or required by AcorOS. diff --git a/Kde/build.sh b/Kde/build.sh index 32ed845..7f36026 100755 --- a/Kde/build.sh +++ b/Kde/build.sh @@ -225,7 +225,6 @@ mkdir -p $acorbuild/build/config/archives mkdir -p $acorbuild/build/config/includes.binary mkdir -p $acorbuild/build/config/hooks/live mkdir -p $acorbuild/build/config/hooks/normal -mkdir -p $acorbuild/build/config/bootloaders mkdir -p $acorbuild/build/config/includes.chroot/usr/share/applications mkdir -p $acorbuild/build/config/includes.chroot/etc/live/config.conf.d mkdir -p $acorbuild/build/config/includes.chroot/usr/share/distro-info @@ -233,19 +232,23 @@ mkdir -p $acorbuild/build/config/includes.chroot//usr/share/python-apt/templates mkdir -p $acorbuild/build/config/includes.chroot/etc/dpkg/origins mkdir -p $acorbuild/build/config/includes.chroot/usr/bin mkdir -p $acorbuild/build/config/includes.chroot/usr/local/bin -mkdir -p $acorbuild/build/config/includes.chroot/etc/sddm.conf.d +mkdir -p $acorbuild/build/config/includes.chroot/etc/lightdm mkdir -p $acorbuild/build/config/includes.chroot/boot/grub mkdir -p $acorbuild/build/config/includes.chroot/etc/default +mkdir -p $acorbuild/build/config/includes.chroot/boot/grub +mkdir -p $acorbuild/build/config/includes.chroot/etc/sddm.conf.d +mkdir -p $uchinanchu/fusato/config/includes.binary # Copy Configs to the chroot cp $acorbuild/acoruserconfig/* $acorbuild/build/config/includes.chroot/etc/live/config.conf.d cp $acorbuild/acorapplication/* $acorbuild/build/config/includes.chroot/usr/share/applications cp $acorbuild/acorhooks/live/* $acorbuild/build/config/hooks/live cp $acorbuild/acorhooks/normal/* $acorbuild/build/config/hooks/normal -cp $acorbuild/acorsddm/* $acorbuild/build/config/includes.chroot/etc/sddm.conf.d +cp $acorbuild/acorlightdm/* $acorbuild/build/config/includes.chroot/etc/lightdm cp $acorbuild/acorgrub/grub $acorbuild/build/config/includes.chroot/etc/default +cp $acorbuild/acorsddm/* $acorbuild/build/config/includes.chroot/etc/sddm.conf.d -cp -r $acorbuild/acorbootloaders/* $acorbuild/build/config/bootloaders +cp -r $acorbuild/acorbootloaders/* $acorbuild/build/config/includes.binary cp -r $acorbuild/acorrepos/* $acorbuild/build/config/archives cp -r $acorbuild/acorcsv/* $acorbuild/build/config/includes.chroot/usr/share/distro-info cp -r $acorbuild/acorgrub/themes $acorbuild/build/config/includes.chroot/boot/grub diff --git a/Lxde/acorhooks/normal/0520-applications.hook.chroot b/Lxde/acorhooks/normal/0520-applications.hook.chroot index c203e1c..4abd320 100755 --- a/Lxde/acorhooks/normal/0520-applications.hook.chroot +++ b/Lxde/acorhooks/normal/0520-applications.hook.chroot @@ -6,7 +6,7 @@ # Remove software # apt remove -y firefox-esr # apt remove -y termit -apt --purge --yes autoremove vim vim-tiny nautilus hv3 mpv murrine-themes smplayer deluge picom gnome-calculator konsole malcontent nvidia-tesla-470-alternative termit raspi-firmware +apt --purge --yes autoremove vim vim-tiny nautilus hv3 mpv murrine-themes smplayer deluge picom gnome-calculator konsole malcontent termit raspi-firmware ## This section is the "lint-trap" to remove files and/or ## directories not associated with or required by AcorOS. diff --git a/Lxde/build.sh b/Lxde/build.sh index 73d6ecc..db2aded 100755 --- a/Lxde/build.sh +++ b/Lxde/build.sh @@ -215,7 +215,6 @@ mkdir -p $acorbuild/build/config/archives mkdir -p $acorbuild/build/config/includes.binary mkdir -p $acorbuild/build/config/hooks/live mkdir -p $acorbuild/build/config/hooks/normal -mkdir -p $acorbuild/build/config/bootloaders mkdir -p $acorbuild/build/config/includes.chroot/usr/share/applications mkdir -p $acorbuild/build/config/includes.chroot/etc/live/config.conf.d mkdir -p $acorbuild/build/config/includes.chroot/usr/share/distro-info @@ -226,6 +225,8 @@ mkdir -p $acorbuild/build/config/includes.chroot/usr/local/bin mkdir -p $acorbuild/build/config/includes.chroot/etc/lightdm mkdir -p $acorbuild/build/config/includes.chroot/boot/grub mkdir -p $acorbuild/build/config/includes.chroot/etc/default +mkdir -p $acorbuild/build/config/includes.chroot/boot/grub +mkdir -p $uchinanchu/fusato/config/includes.binary # Copy Configs to the chroot cp $acorbuild/acoruserconfig/* $acorbuild/build/config/includes.chroot/etc/live/config.conf.d @@ -235,7 +236,7 @@ cp $acorbuild/acorhooks/normal/* $acorbuild/build/config/hooks/normal cp $acorbuild/acorlightdm/* $acorbuild/build/config/includes.chroot/etc/lightdm cp $acorbuild/acorgrub/grub $acorbuild/build/config/includes.chroot/etc/default -cp -r $acorbuild/acorbootloaders/* $acorbuild/build/config/bootloaders +cp -r $acorbuild/acorbootloaders/* $acorbuild/build/config/includes.binary cp -r $acorbuild/acorrepos/* $acorbuild/build/config/archives cp -r $acorbuild/acorcsv/* $acorbuild/build/config/includes.chroot/usr/share/distro-info cp -r $acorbuild/acorgrub/themes $acorbuild/build/config/includes.chroot/boot/grub diff --git a/Lxde32/acorhooks/normal/0520-applications.hook.chroot b/Lxde32/acorhooks/normal/0520-applications.hook.chroot index fe50252..85290b6 100755 --- a/Lxde32/acorhooks/normal/0520-applications.hook.chroot +++ b/Lxde32/acorhooks/normal/0520-applications.hook.chroot @@ -6,7 +6,7 @@ # Remove software # apt remove -y firefox-esr # apt remove -y termit -apt --purge --yes autoremove vim vim-tiny nautilus hv3 mpv murrine-themes smplayer deluge picom gnome-calculator konsole malcontent nvidia-tesla-470-alternative termit raspi-firmware +apt --purge --yes autoremove vim vim-tiny nautilus hv3 mpv murrine-themes smplayer deluge picom gnome-calculator konsole termit raspi-firmware ## This section is the "lint-trap" to remove files and/or ## directories not associated with or required by AcorOS. diff --git a/Lxde32/build.sh b/Lxde32/build.sh index 0783eb1..c176cff 100755 --- a/Lxde32/build.sh +++ b/Lxde32/build.sh @@ -213,7 +213,6 @@ mkdir -p $acorbuild/build/config/archives mkdir -p $acorbuild/build/config/includes.binary mkdir -p $acorbuild/build/config/hooks/live mkdir -p $acorbuild/build/config/hooks/normal -mkdir -p $acorbuild/build/config/bootloaders mkdir -p $acorbuild/build/config/includes.chroot/usr/share/applications mkdir -p $acorbuild/build/config/includes.chroot/etc/live/config.conf.d mkdir -p $acorbuild/build/config/includes.chroot/usr/share/distro-info @@ -224,6 +223,8 @@ mkdir -p $acorbuild/build/config/includes.chroot/usr/local/bin mkdir -p $acorbuild/build/config/includes.chroot/etc/lightdm mkdir -p $acorbuild/build/config/includes.chroot/boot/grub mkdir -p $acorbuild/build/config/includes.chroot/etc/default +mkdir -p $acorbuild/build/config/includes.chroot/boot/grub +mkdir -p $uchinanchu/fusato/config/includes.binary # Copy Configs to the chroot cp $acorbuild/acoruserconfig/* $acorbuild/build/config/includes.chroot/etc/live/config.conf.d @@ -233,7 +234,7 @@ cp $acorbuild/acorhooks/normal/* $acorbuild/build/config/hooks/normal cp $acorbuild/acorlightdm/* $acorbuild/build/config/includes.chroot/etc/lightdm cp $acorbuild/acorgrub/grub $acorbuild/build/config/includes.chroot/etc/default -cp -r $acorbuild/acorbootloaders/* $acorbuild/build/config/bootloaders +cp -r $acorbuild/acorbootloaders/* $acorbuild/build/config/includes.binary cp -r $acorbuild/acorrepos/* $acorbuild/build/config/archives cp -r $acorbuild/acorcsv/* $acorbuild/build/config/includes.chroot/usr/share/distro-info cp -r $acorbuild/acorgrub/themes $acorbuild/build/config/includes.chroot/boot/grub diff --git a/Lxqt/acorhooks/normal/0520-applications.hook.chroot b/Lxqt/acorhooks/normal/0520-applications.hook.chroot index a77a986..c16c2ae 100755 --- a/Lxqt/acorhooks/normal/0520-applications.hook.chroot +++ b/Lxqt/acorhooks/normal/0520-applications.hook.chroot @@ -6,7 +6,7 @@ # Remove software # apt remove -y firefox-esr # apt remove -y termit -apt --purge --yes autoremove vim vim-tiny nautilus hv3 mpv murrine-themes smplayer deluge picom gnome-calculator konsole malcontent nvidia-tesla-470-alternative termit raspi-firmware +apt --purge --yes autoremove vim vim-tiny nautilus hv3 mpv murrine-themes smplayer deluge picom gnome-calculator konsole malcontent termit raspi-firmware ## This section is the "lint-trap" to remove files and/or ## directories not associated with or required by AcorOS. diff --git a/Lxqt/build.sh b/Lxqt/build.sh index b300b00..351292b 100755 --- a/Lxqt/build.sh +++ b/Lxqt/build.sh @@ -210,7 +210,6 @@ mkdir -p $acorbuild/build/config/archives mkdir -p $acorbuild/build/config/includes.binary mkdir -p $acorbuild/build/config/hooks/live mkdir -p $acorbuild/build/config/hooks/normal -mkdir -p $acorbuild/build/config/bootloaders mkdir -p $acorbuild/build/config/includes.chroot/usr/share/applications mkdir -p $acorbuild/build/config/includes.chroot/etc/live/config.conf.d mkdir -p $acorbuild/build/config/includes.chroot/usr/share/distro-info @@ -219,6 +218,10 @@ mkdir -p $acorbuild/build/config/includes.chroot/etc/dpkg/origins mkdir -p $acorbuild/build/config/includes.chroot/usr/bin mkdir -p $acorbuild/build/config/includes.chroot/usr/local/bin mkdir -p $acorbuild/build/config/includes.chroot/etc/lightdm +mkdir -p $acorbuild/build/config/includes.chroot/boot/grub +mkdir -p $acorbuild/build/config/includes.chroot/etc/default +mkdir -p $acorbuild/build/config/includes.chroot/boot/grub +mkdir -p $uchinanchu/fusato/config/includes.binary # Copy Configs to the chroot cp $acorbuild/acoruserconfig/* $acorbuild/build/config/includes.chroot/etc/live/config.conf.d @@ -228,11 +231,10 @@ cp $acorbuild/acorhooks/normal/* $acorbuild/build/config/hooks/normal cp $acorbuild/acorlightdm/* $acorbuild/build/config/includes.chroot/etc/lightdm cp $acorbuild/acorgrub/grub $acorbuild/build/config/includes.chroot/etc/default -cp -r $acorbuild/acorbootloaders/* $acorbuild/build/config/bootloaders +cp -r $acorbuild/acorbootloaders/* $acorbuild/build/config/includes.binary cp -r $acorbuild/acorrepos/* $acorbuild/build/config/archives cp -r $acorbuild/acorcsv/* $acorbuild/build/config/includes.chroot/usr/share/distro-info cp -r $acorbuild/acorgrub/themes $acorbuild/build/config/includes.chroot/boot/grub - #symlinks chroot ln -s Debian.info $acorbuild/build/config/includes.chroot/usr/share/python-apt/templates/Acoros.info ln -s Debian.mirrors $acorbuild/build/config/includes.chroot/usr/share/python-apt/templates/Acoros.mirrors diff --git a/Lxqt32/acorhooks/normal/0520-applications.hook.chroot b/Lxqt32/acorhooks/normal/0520-applications.hook.chroot index d777f3e..afd5903 100755 --- a/Lxqt32/acorhooks/normal/0520-applications.hook.chroot +++ b/Lxqt32/acorhooks/normal/0520-applications.hook.chroot @@ -6,7 +6,7 @@ # Remove software # apt remove -y firefox-esr # apt remove -y termit -apt --purge --yes autoremove vim vim-tiny hv3 mpv murrine-themes smplayer smtube audacious screengrab konsole malcontent termit nvidia-tesla-470-alternative raspi-firmware +apt --purge --yes autoremove vim vim-tiny hv3 mpv murrine-themes smplayer smtube audacious screengrab konsole malcontent termit raspi-firmware ## This section is the "lint-trap" to remove files and/or ## directories not associated with or required by AcorOS. diff --git a/Lxqt32/build.sh b/Lxqt32/build.sh index f6a3615..79f2380 100755 --- a/Lxqt32/build.sh +++ b/Lxqt32/build.sh @@ -207,7 +207,6 @@ mkdir -p $acorbuild/build/config/archives mkdir -p $acorbuild/build/config/includes.binary mkdir -p $acorbuild/build/config/hooks/live mkdir -p $acorbuild/build/config/hooks/normal -mkdir -p $acorbuild/build/config/bootloaders mkdir -p $acorbuild/build/config/includes.chroot/usr/share/applications mkdir -p $acorbuild/build/config/includes.chroot/etc/live/config.conf.d mkdir -p $acorbuild/build/config/includes.chroot/usr/share/distro-info @@ -216,22 +215,23 @@ mkdir -p $acorbuild/build/config/includes.chroot/etc/dpkg/origins mkdir -p $acorbuild/build/config/includes.chroot/usr/bin mkdir -p $acorbuild/build/config/includes.chroot/usr/local/bin mkdir -p $acorbuild/build/config/includes.chroot/etc/lightdm +mkdir -p $acorbuild/build/config/includes.chroot/boot/grub +mkdir -p $acorbuild/build/config/includes.chroot/etc/default +mkdir -p $acorbuild/build/config/includes.chroot/boot/grub +mkdir -p $uchinanchu/fusato/config/includes.binary # Copy Configs to the chroot cp $acorbuild/acoruserconfig/* $acorbuild/build/config/includes.chroot/etc/live/config.conf.d cp $acorbuild/acorapplication/* $acorbuild/build/config/includes.chroot/usr/share/applications cp $acorbuild/acorhooks/live/* $acorbuild/build/config/hooks/live cp $acorbuild/acorhooks/normal/* $acorbuild/build/config/hooks/normal -cp $acorbuild/../MakePackageLists.sh $acorbuild/build/config/includes.chroot/usr/local/bin -cp $acorbuild/acoruserconfig/* $acorbuild/build/config/includes.chroot/etc/live/config.conf.d cp $acorbuild/acorlightdm/* $acorbuild/build/config/includes.chroot/etc/lightdm +cp $acorbuild/acorgrub/grub $acorbuild/build/config/includes.chroot/etc/default -cp -r $acorbuild/acorbootloaders/* $acorbuild/build/config/bootloaders +cp -r $acorbuild/acorbootloaders/* $acorbuild/build/config/includes.binary cp -r $acorbuild/acorrepos/* $acorbuild/build/config/archives -cp -r $acorbuild/acorkeys/* $acorbuild/build/config/archives cp -r $acorbuild/acorcsv/* $acorbuild/build/config/includes.chroot/usr/share/distro-info cp -r $acorbuild/acorgrub/themes $acorbuild/build/config/includes.chroot/boot/grub - #symlinks chroot ln -s Debian.info $acorbuild/build/config/includes.chroot/usr/share/python-apt/templates/Acoros.info ln -s Debian.mirrors $acorbuild/build/config/includes.chroot/usr/share/python-apt/templates/Acoros.mirrors diff --git a/Mate/acorhooks/normal/0520-applications.hook.chroot b/Mate/acorhooks/normal/0520-applications.hook.chroot index 37c184c..d237bb3 100755 --- a/Mate/acorhooks/normal/0520-applications.hook.chroot +++ b/Mate/acorhooks/normal/0520-applications.hook.chroot @@ -6,7 +6,7 @@ # Remove software # apt remove -y firefox-esr # apt remove -y termit -apt --purge --yes autoremove vim vim-tiny gnome-system-monitor hv3 mpv murrine-themes konsole malcontent nvidia-tesla-470-alternative termit raspi-firmware +apt --purge --yes autoremove vim vim-tiny gnome-system-monitor hv3 mpv murrine-themes konsole malcontent termit raspi-firmware ## This section is the "lint-trap" to remove files and/or diff --git a/Mate/build.sh b/Mate/build.sh index 7f5975f..ab5e5a1 100755 --- a/Mate/build.sh +++ b/Mate/build.sh @@ -225,7 +225,6 @@ mkdir -p $acorbuild/build/config/archives mkdir -p $acorbuild/build/config/includes.binary mkdir -p $acorbuild/build/config/hooks/live mkdir -p $acorbuild/build/config/hooks/normal -mkdir -p $acorbuild/build/config/bootloaders mkdir -p $acorbuild/build/config/includes.chroot/usr/share/applications mkdir -p $acorbuild/build/config/includes.chroot/etc/live/config.conf.d mkdir -p $acorbuild/build/config/includes.chroot/usr/share/distro-info @@ -236,6 +235,8 @@ mkdir -p $acorbuild/build/config/includes.chroot/usr/local/bin mkdir -p $acorbuild/build/config/includes.chroot/etc/lightdm mkdir -p $acorbuild/build/config/includes.chroot/boot/grub mkdir -p $acorbuild/build/config/includes.chroot/etc/default +mkdir -p $acorbuild/build/config/includes.chroot/boot/grub +mkdir -p $uchinanchu/fusato/config/includes.binary # Copy Configs to the chroot cp $acorbuild/acoruserconfig/* $acorbuild/build/config/includes.chroot/etc/live/config.conf.d @@ -245,9 +246,8 @@ cp $acorbuild/acorhooks/normal/* $acorbuild/build/config/hooks/normal cp $acorbuild/acorlightdm/* $acorbuild/build/config/includes.chroot/etc/lightdm cp $acorbuild/acorgrub/grub $acorbuild/build/config/includes.chroot/etc/default -cp -r $acorbuild/acorbootloaders/* $acorbuild/build/config/bootloaders +cp -r $acorbuild/acorbootloaders/* $acorbuild/build/config/includes.binary cp -r $acorbuild/acorrepos/* $acorbuild/build/config/archives -cp -r $acorbuild/acorkeys/* $acorbuild/build/config/archives cp -r $acorbuild/acorcsv/* $acorbuild/build/config/includes.chroot/usr/share/distro-info cp -r $acorbuild/acorgrub/themes $acorbuild/build/config/includes.chroot/boot/grub diff --git a/Xfce/acorhooks/normal/0520-applications.hook.chroot b/Xfce/acorhooks/normal/0520-applications.hook.chroot index abcd95d..aa5e71d 100755 --- a/Xfce/acorhooks/normal/0520-applications.hook.chroot +++ b/Xfce/acorhooks/normal/0520-applications.hook.chroot @@ -6,7 +6,7 @@ # Remove software # apt remove -y firefox-esr # apt remove -y termit -apt --purge --yes autoremove vim vim-tiny nautilus hv3 mpv murrine-themes konsole malcontent termit nvidia-tesla-470-alternative raspi-firmware +apt --purge --yes autoremove vim vim-tiny nautilus hv3 mpv murrine-themes konsole malcontent termit raspi-firmware ## This section is the "lint-trap" to remove files and/or ## directories not associated with or required by AcorOS. diff --git a/Xfce/build.sh b/Xfce/build.sh index e48b5a4..b44436f 100755 --- a/Xfce/build.sh +++ b/Xfce/build.sh @@ -217,7 +217,6 @@ mkdir -p $acorbuild/build/config/archives mkdir -p $acorbuild/build/config/includes.binary mkdir -p $acorbuild/build/config/hooks/live mkdir -p $acorbuild/build/config/hooks/normal -mkdir -p $acorbuild/build/config/bootloaders mkdir -p $acorbuild/build/config/includes.chroot/usr/share/applications mkdir -p $acorbuild/build/config/includes.chroot/etc/live/config.conf.d mkdir -p $acorbuild/build/config/includes.chroot/usr/share/distro-info @@ -228,6 +227,8 @@ mkdir -p $acorbuild/build/config/includes.chroot/usr/local/bin mkdir -p $acorbuild/build/config/includes.chroot/etc/lightdm mkdir -p $acorbuild/build/config/includes.chroot/boot/grub mkdir -p $acorbuild/build/config/includes.chroot/etc/default +mkdir -p $acorbuild/build/config/includes.chroot/boot/grub +mkdir -p $uchinanchu/fusato/config/includes.binary # Copy Configs to the chroot cp $acorbuild/acoruserconfig/* $acorbuild/build/config/includes.chroot/etc/live/config.conf.d @@ -237,8 +238,8 @@ cp $acorbuild/acorhooks/normal/* $acorbuild/build/config/hooks/normal cp $acorbuild/acorlightdm/* $acorbuild/build/config/includes.chroot/etc/lightdm cp $acorbuild/acorgrub/grub $acorbuild/build/config/includes.chroot/etc/default +cp -r $acorbuild/acorbootloaders/* $acorbuild/build/config/includes.binary cp -r $acorbuild/acorrepos/* $acorbuild/build/config/archives -cp -r $acorbuild/acorbootloaders/* $acorbuild/build/config/bootloaders cp -r $acorbuild/acorcsv/* $acorbuild/build/config/includes.chroot/usr/share/distro-info cp -r $acorbuild/acorgrub/themes $acorbuild/build/config/includes.chroot/boot/grub diff --git a/Xfce32/acorhooks/normal/0520-applications.hook.chroot b/Xfce32/acorhooks/normal/0520-applications.hook.chroot index e342498..67758a0 100755 --- a/Xfce32/acorhooks/normal/0520-applications.hook.chroot +++ b/Xfce32/acorhooks/normal/0520-applications.hook.chroot @@ -6,7 +6,7 @@ # Remove software # apt remove -y firefox-esr # apt remove -y termit -apt --purge --yes autoremove vim vim-tiny nautilus hv3 mpv murrine-themes konsole malcontent termit nvidia-tesla-470-alternative raspi-firmware +apt --purge --yes autoremove vim vim-tiny nautilus hv3 mpv murrine-themes konsole malcontent termit raspi-firmware ## This section is the "lint-trap" to remove files and/or ## directories not associated with or required by AcorOS. diff --git a/Xfce32/build.sh b/Xfce32/build.sh index a2e55dd..0b7e1b7 100755 --- a/Xfce32/build.sh +++ b/Xfce32/build.sh @@ -215,7 +215,6 @@ mkdir -p $acorbuild/build/config/archives mkdir -p $acorbuild/build/config/includes.binary mkdir -p $acorbuild/build/config/hooks/live mkdir -p $acorbuild/build/config/hooks/normal -mkdir -p $acorbuild/build/config/bootloaders mkdir -p $acorbuild/build/config/includes.chroot/usr/share/applications mkdir -p $acorbuild/build/config/includes.chroot/etc/live/config.conf.d mkdir -p $acorbuild/build/config/includes.chroot/usr/share/distro-info @@ -226,17 +225,18 @@ mkdir -p $acorbuild/build/config/includes.chroot/usr/local/bin mkdir -p $acorbuild/build/config/includes.chroot/etc/lightdm mkdir -p $acorbuild/build/config/includes.chroot/boot/grub mkdir -p $acorbuild/build/config/includes.chroot/etc/default +mkdir -p $acorbuild/build/config/includes.chroot/boot/grub +mkdir -p $uchinanchu/fusato/config/includes.binary # Copy Configs to the chroot cp $acorbuild/acoruserconfig/* $acorbuild/build/config/includes.chroot/etc/live/config.conf.d cp $acorbuild/acorapplication/* $acorbuild/build/config/includes.chroot/usr/share/applications cp $acorbuild/acorhooks/live/* $acorbuild/build/config/hooks/live cp $acorbuild/acorhooks/normal/* $acorbuild/build/config/hooks/normal -/includes.chroot/usr/local/bin cp $acorbuild/acorlightdm/* $acorbuild/build/config/includes.chroot/etc/lightdm cp $acorbuild/acorgrub/grub $acorbuild/build/config/includes.chroot/etc/default -cp -r $acorbuild/acorbootloaders/* $acorbuild/build/config/bootloaders +cp -r $acorbuild/acorbootloaders/* $acorbuild/build/config/includes.binary cp -r $acorbuild/acorrepos/* $acorbuild/build/config/archives cp -r $acorbuild/acorcsv/* $acorbuild/build/config/includes.chroot/usr/share/distro-info cp -r $acorbuild/acorgrub/themes $acorbuild/build/config/includes.chroot/boot/grub