diff --git a/Budgie/acorhooks/normal/0520-applications.hook.chroot b/Budgie/acorhooks/normal/0520-applications.hook.chroot index 8655288..75667ed 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 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 systemsettings ## This section is the "lint-trap" to remove files and/or ## directories not associated with or required by AcorOS. diff --git a/Cinnamon/acorhooks/normal/0520-applications.hook.chroot b/Cinnamon/acorhooks/normal/0520-applications.hook.chroot index 10d7a95..0415d7e 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 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 systemsettings ## 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/Gnome/acorhooks/normal/0520-applications.hook.chroot b/Gnome/acorhooks/normal/0520-applications.hook.chroot index d33cbe5..0de4ddc 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 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 systemsettings ## 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 7f36026..af72dbb 100755 --- a/Kde/build.sh +++ b/Kde/build.sh @@ -244,7 +244,6 @@ cp $acorbuild/acoruserconfig/* $acorbuild/build/config/includes.chroot/etc/live/ 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 $acorbuild/acorsddm/* $acorbuild/build/config/includes.chroot/etc/sddm.conf.d diff --git a/Lxde/BldHelper.sh b/Lxde/BldHelper.sh deleted file mode 100755 index ece84d6..0000000 --- a/Lxde/BldHelper.sh +++ /dev/null @@ -1,52 +0,0 @@ - #!/bin/bash - -################################################################################ -# Title: Bldhelper.sh -# Description: Script to build AçorOS ISO image -# Author: PeppermintOS Team -# Date: May 10, 2023 -# License: GPL-3.0-or-later -################################################################################ - -# Set environment variables -PREFIX=AcorOS-lxde -SUFFIX=amd64 -BUILD=lxde -TODAY=$(date -u +"%Y-%m-%d") -FileName="${PREFIX}-${SUFFIX}" -LOCATION=/var/www/html/nightly/AcorOS/${BUILD} -LogDir=/var/log/Live-Build -WorkingDir=/home/pepadmin/Build-configs/Lxde - -# Execute the ISO building script -cd ${WorkingDir} -./build.sh - -# Move and rename the ISO file -cd build -mv *.iso ${FileName}-${TODAY}.iso - -# Create the checksum file for the ISO -sha512sum ${FileName}-${TODAY}.iso > ${FileName}-${TODAY}-sha512.checksum - -# Remove old ISO and checksum files from the desired location -rm -f ${LOCATION}/${FileName}*.iso -rm -f ${LOCATION}/${FileName}*-sha512.checksum - -# Move the ISO and checksum files to the desired location -mkdir -p ${LOCATION} -mv ${FileName}-${TODAY}.iso ${LOCATION} -mv ${FileName}-${TODAY}-sha512.checksum ${LOCATION} - -# Move the log file to the log directory (if it exists) -if [ -f /tmp/${PREFIX}${SUFFIX}.out ]; then - mv /tmp/${PREFIX}${SUFFIX}.out ${LogDir}/${PREFIX}-${SUFFIX}-${BUILD}.log -fi - -# Clean the build folder -lb clean - -# Remove the "build" directory and its contents -cd .. -rm -rf build - diff --git a/Lxde/acorapplication b/Lxde/acorapplication deleted file mode 120000 index e2f9133..0000000 --- a/Lxde/acorapplication +++ /dev/null @@ -1 +0,0 @@ -../acorapplication \ No newline at end of file diff --git a/Lxde/acorbootloaders b/Lxde/acorbootloaders deleted file mode 120000 index 162ad0c..0000000 --- a/Lxde/acorbootloaders +++ /dev/null @@ -1 +0,0 @@ -../acorbootloaders \ No newline at end of file diff --git a/Lxde/acorcsv b/Lxde/acorcsv deleted file mode 120000 index 799da98..0000000 --- a/Lxde/acorcsv +++ /dev/null @@ -1 +0,0 @@ -../acorcsv \ No newline at end of file diff --git a/Lxde/acorgrub b/Lxde/acorgrub deleted file mode 120000 index d9a5ac7..0000000 --- a/Lxde/acorgrub +++ /dev/null @@ -1 +0,0 @@ -../acorgrub \ No newline at end of file diff --git a/Lxde/acorhooks/live/0030-user-setup b/Lxde/acorhooks/live/0030-user-setup deleted file mode 100755 index 141ab32..0000000 --- a/Lxde/acorhooks/live/0030-user-setup +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/sh - -. /lib/live/config.sh - -## live-config(7) - System Configuration Components -## Copyright (C) 2016-2020 The Debian Live team -## Copyright (C) 2006-2015 Daniel Baumann -## -## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. -## This is free software, and you are welcome to redistribute it -## under certain conditions; see COPYING for details. - - -#set -e - -Cmdline () -{ - # Reading kernel command line - for _PARAMETER in ${LIVE_CONFIG_CMDLINE} - do - case "${_PARAMETER}" in - live-config.user-default-groups=*|user-default-groups=*) - LIVE_USER_DEFAULT_GROUPS="${_PARAMETER#*user-default-groups=}" - ;; - - live-config.user-fullname=*|user-fullname=*) - LIVE_USER_FULLNAME="${_PARAMETER#*user-fullname=}" - ;; - - live-config.username=*|username=*) - LIVE_USERNAME="${_PARAMETER#*username=}" - ;; - esac - done -} - -Init () -{ - # Checking if package is installed or already configured - if ! pkg_is_installed "user-setup" || \ - component_was_executed "user-setup" - then - exit 0 - fi - - echo -n " user-setup" -} - -Config () -{ - # Checking if package is already configured differently - if grep -q "^${LIVE_USERNAME}:" /etc/passwd - then - exit 0 - fi - - # Adjust formating of groups - if [ -n "${LIVE_USER_DEFAULT_GROUPS}" ] - then - LIVE_USER_DEFAULT_GROUPS="$(echo ${LIVE_USER_DEFAULT_GROUPS} | sed -e 's|,| |g')" - fi - - # Make sure user is not in sudo group if sudo is disabled - case "${LIVE_CONFIG_NOROOT}" in - true) - LIVE_USER_DEFAULT_GROUPS="$(echo ${LIVE_USER_DEFAULT_GROUPS} | sed -e 's|sudo||')" - ;; - esac - - # Default password is: live - # passwords can be generated with 'echo "live" | mkpasswd -s', - # a blank password is 'U6aMy0wojraho'. -# _PASSWORD="8Ab05sVQ4LLps" - _PASSWORD="U6aMy0wojraho" - -cat > /tmp/live-config.cfg << EOF -user-setup passwd/make-user boolean true -user-setup passwd/root-password-crypted string * -user-setup passwd/user-password-crypted string ${_PASSWORD} -user-setup passwd/user-default-groups string ${LIVE_USER_DEFAULT_GROUPS} -user-setup passwd/user-fullname string ${LIVE_USER_FULLNAME} -user-setup passwd/username string ${LIVE_USERNAME} -user-setup passwd/user-uid string 1000 -EOF - - debconf-set-selections < /tmp/live-config.cfg - rm -f /tmp/live-config.cfg - - # Workaround for bug in shadow - set +e - /usr/lib/user-setup/user-setup-apply 2>&1 \ - | grep -v "Shadow passwords are now on" - set -e - - # Creating state file - touch /var/lib/live/config/user-setup -} - -Cmdline -Init -Config diff --git a/Lxde/acorhooks/normal/0520-applications.hook.chroot b/Lxde/acorhooks/normal/0520-applications.hook.chroot deleted file mode 100755 index 4abd320..0000000 --- a/Lxde/acorhooks/normal/0520-applications.hook.chroot +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash - -### Error checking added to "lint-trap" section. -### Missing files no longer cause builds to fail. - -# 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 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. - -for i in \ -/usr/share/applications/lxde-x-www-browser.desktop \ -/usr/share/applications/org.kde.kde5.desktop \ -/usr/share/applications/acoroslocale-im.desktop \ -/etc/alternatives/vi \ - - do [ -e $i ] && - rm -rf ${i} || - echo " The path ${i} was not found and couldn't be removed." - done -# Lowers the footprint in RAM at the small expense of added size to the ISO. -update-icon-caches /usr/share/icons/* - -#add flatpak repo to gnome-software -flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - diff --git a/Lxde/acorhooks/normal/0600-snap-show-menu-fix.hook.chroot b/Lxde/acorhooks/normal/0600-snap-show-menu-fix.hook.chroot deleted file mode 100755 index 81056ad..0000000 --- a/Lxde/acorhooks/normal/0600-snap-show-menu-fix.hook.chroot +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -# Workaround for using snapd on debian. Thank You - @stevesveryown and peppermint team.. -[ ! -e /etc/skel/.local/share ] && mkdir -p /etc/skel/.local/share -[ ! -e /var/lib/snapd/desktop/applications ] && -mkdir -p /var/lib/snapd/desktop/applications && -chmod 777 /var/lib/snapd/desktop/applications -ln -s /var/lib/snapd/desktop/applications /etc/skel/.local/share/applications -ln -s snap /usr/bin/snap-store - - diff --git a/Lxde/acorlightdm b/Lxde/acorlightdm deleted file mode 120000 index 85c8ff7..0000000 --- a/Lxde/acorlightdm +++ /dev/null @@ -1 +0,0 @@ -../acorlightdm \ No newline at end of file diff --git a/Lxde/acorprofile b/Lxde/acorprofile deleted file mode 120000 index 29d1f75..0000000 --- a/Lxde/acorprofile +++ /dev/null @@ -1 +0,0 @@ -../acorprofile \ No newline at end of file diff --git a/Lxde/acorrepos b/Lxde/acorrepos deleted file mode 120000 index c3e5c40..0000000 --- a/Lxde/acorrepos +++ /dev/null @@ -1 +0,0 @@ -../acorrepos \ No newline at end of file diff --git a/Lxde/acoruserconfig b/Lxde/acoruserconfig deleted file mode 120000 index 486688c..0000000 --- a/Lxde/acoruserconfig +++ /dev/null @@ -1 +0,0 @@ -../acoruserconfig \ No newline at end of file diff --git a/Lxde/build.sh b/Lxde/build.sh deleted file mode 100755 index db2aded..0000000 --- a/Lxde/build.sh +++ /dev/null @@ -1,254 +0,0 @@ -#!/bin/bash -PATH="/sbin:/usr/sbin:/usr/local/sbin:$PATH" - -# Set the working folder variable -acorbuild="$(pwd)" - - -# Create the build folder, move into it removing stale mountpoints and files there. -[ -e build ] && [ ! -d build ] && rm -f build || [ ! -e build ] && mkdir build -cd build -umount $(mount | grep "${PWD}/chroot" | tac | cut -f3 -d" ") 2>/dev/null -for i in ./* ./.build ./cache/bootstrap ; do [ $i = ./cache ] && continue || rm -rf $i ; done - - -# Set of the structure to be used for the ISO and Live system. -# See /usr/lib/live/build/config for a full list of examples. -# Up above is the manual description of what options I used so far. - -lb config noauto \ - --binary-images iso-hybrid \ - --mode debian \ - --architectures amd64 \ - --linux-flavours amd64 \ - --distribution bookworm \ - --archive-areas "main contrib non-free non-free-firmware" \ - --mirror-bootstrap https://deb.debian.org/debian \ - --parent-mirror-bootstrap https://deb.debian.org/debian \ - --parent-mirror-chroot https://deb.debian.org/debian \ - --parent-mirror-chroot-security https://security.debian.org/debian-security \ - --parent-mirror-binary https://deb.debian.org/debian \ - --parent-mirror-binary-security https://security.debian.org/debian-security \ - --mirror-chroot https://deb.debian.org/debian \ - --mirror-chroot-security https://security.debian.org/debian-security \ - --updates true \ - --security true \ - --backports false \ - --cache true \ - --apt-recommends true \ - --iso-application AcorOS \ - --win32-loader false \ - --iso-preparer acoros-https://sourceforge.net/projects/acor-os/ \ - --iso-publisher acoros-https://sourceforge.net/projects/acor-os/ \ - --iso-volume AcorOS \ - --image-name "AcorOS" \ - --win32-loader false \ - --checksums sha512 \ - --zsync false \ - "${@}" - - -# Install the Lxde Desktop -mkdir -p $acorbuild/build/config/package-lists -echo lxde > $acorbuild/build/config/package-lists/desktop.list.chroot - -# Install software -echo "# Install software to the squashfs for calamares to unpack to the OS. -linux-headers-amd64 -locales -nala -dbus-x11 -ntp -acoros-keyring -xorg -xserver-xorg -xserver-xorg-input-synaptics -xserver-xorg-input-all -xserver-xorg-video-vmware -xserver-xorg-video-all -w64codecs -ffmpeg -sox -twolame -lame -faad -gstreamer1.0-plugins-good -gstreamer1.0-plugins-ugly -gstreamer1.0-plugins-bad -gstreamer1.0-pulseaudio -unrar -rar -p7zip-full -p7zip-rar -zip -unzip -pulseaudio -pavucontrol -alsa-utils -aptitude -synaptic -gparted -apt-config-auto-update -libelf-dev -htop -package-update-indicator -desktop-base -gnome-packagekit -gvfs-backends -samba -gnome-packagekit -iso-flag-png -sambashare -network-manager -network-manager-gnome -bluez -blueman -gufw -acoros-icons -numix-gtk-theme -orchis-gtk-theme -darc-aurora-gtk-theme -blue-papirus-icons -brown-papirus-icons -papirus-dark-grey -papirus-icon-theme -gtk2-engines -acoros-backgrounds -plymouth -plymouth-themes -cups -system-config-printer -lightdm -lightdm-gtk-greeter -lightdm-gtk-greeter-settings -acoros-lxde-configs -menulibre -mugshot -xscreensaver -xscreensaver-data -xscreensaver-data-extra -xscreensaver-gl -xscreensaver-gl-extra -gnome-system-tools -gnome-disk-utility -gnome-calculator -neofetch -accountsservice -catfish -timeshift -compton -compton-conf -gnome-software -gnome-software-plugin-flatpak -gnome-software-plugin-snap -fwupd -bleachbit -dconf-editor -gimp -gimp-data-extras -evince -xsane -transmission-gtk -thunderbird -thunderbird-l10n-pt-br -thunderbird-l10n-pt-pt -thunderbird-l10n-de -thunderbird-l10n-en-gb -thunderbird-l10n-es-es -thunderbird-l10n-fr -thunderbird-l10n-it -chromium -chromium-l10n -libreoffice -libreoffice-gtk3 -libreoffice-l10n-pt -libreoffice-l10n-pt-br -libreoffice-l10n-de -libreoffice-l10n-en-gb -libreoffice-l10n-es -libreoffice-l10n-fr -libreoffice-l10n-it -printer-driver-cups-pdf -gnome-2048 -gnome-chess -gnome-mahjongg -gnome-sudoku -guvcview -vlc -xfburn -qt5-style-plugins -qt5ct -calamares-settings-acoros -calamares -gdebi -f2fs-tools -xfsprogs -xfsdump -grub-pc - -" > $acorbuild/build/config/package-lists/packages.list.chroot - - -# Packages to be stored in /pool but not installed in the OS . -echo "# These packages are available to the installer, for offline use. -efibootmgr -grub-common -grub2-common -grub-efi -grub-efi-amd64 -grub-efi-amd64-bin -grub-efi-amd64-signed -libefiboot1 -libefivar1 -mokutil -os-prober -shim-helpers-amd64-signed -shim-signed -shim-signed-common -shim-unsigned - -" > $acorbuild/build/config/package-lists/installer.list.binary - - -# Setup the chroot structure -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/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 -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/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 -ln -s debian.csv $acorbuild/build/config/includes.chroot/usr/share/distro-info/acoros.csv -ln -s acoros $acorbuild/build/config/includes.chroot/etc/dpkg/origins/default - - -# Build the ISO # -lb build #--debug --verbose - - diff --git a/Lxde32/BldHelper.sh b/Lxde32/BldHelper.sh deleted file mode 100755 index 002e820..0000000 --- a/Lxde32/BldHelper.sh +++ /dev/null @@ -1,52 +0,0 @@ - #!/bin/bash - -################################################################################ -# Title: Bldhelper.sh -# Description: Script to build AçorOS ISO image -# Author: PeppermintOS Team -# Date: May 10, 2023 -# License: GPL-3.0-or-later -################################################################################ - -# Set environment variables -PREFIX=AcorOS-lxde -SUFFIX=i386 -BUILD=lxde -TODAY=$(date -u +"%Y-%m-%d") -FileName="${PREFIX}-${SUFFIX}" -LOCATION=/var/www/html/nightly/AcorOS/${BUILD} -LogDir=/var/log/Live-Build -WorkingDir=/home/pepadmin/Build-configs/lxde32 - -# Execute the ISO building script -cd ${WorkingDir} -./build.sh - -# Move and rename the ISO file -cd build -mv *.iso ${FileName}-${TODAY}.iso - -# Create the checksum file for the ISO -sha512sum ${FileName}-${TODAY}.iso > ${FileName}-${TODAY}-sha512.checksum - -# Remove old ISO and checksum files from the desired location -rm -f ${LOCATION}/${FileName}*.iso -rm -f ${LOCATION}/${FileName}*-sha512.checksum - -# Move the ISO and checksum files to the desired location -mkdir -p ${LOCATION} -mv ${FileName}-${TODAY}.iso ${LOCATION} -mv ${FileName}-${TODAY}-sha512.checksum ${LOCATION} - -# Move the log file to the log directory (if it exists) -if [ -f /tmp/${PREFIX}${SUFFIX}.out ]; then - mv /tmp/${PREFIX}${SUFFIX}.out ${LogDir}/${PREFIX}-${SUFFIX}-${BUILD}.log -fi - -# Clean the build folder -lb clean - -# Remove the "build" directory and its contents -cd .. -rm -rf build - diff --git a/Lxde32/acorapplication b/Lxde32/acorapplication deleted file mode 120000 index e2f9133..0000000 --- a/Lxde32/acorapplication +++ /dev/null @@ -1 +0,0 @@ -../acorapplication \ No newline at end of file diff --git a/Lxde32/acorbootloaders b/Lxde32/acorbootloaders deleted file mode 120000 index 162ad0c..0000000 --- a/Lxde32/acorbootloaders +++ /dev/null @@ -1 +0,0 @@ -../acorbootloaders \ No newline at end of file diff --git a/Lxde32/acorcsv b/Lxde32/acorcsv deleted file mode 120000 index 799da98..0000000 --- a/Lxde32/acorcsv +++ /dev/null @@ -1 +0,0 @@ -../acorcsv \ No newline at end of file diff --git a/Lxde32/acorgrub b/Lxde32/acorgrub deleted file mode 120000 index d9a5ac7..0000000 --- a/Lxde32/acorgrub +++ /dev/null @@ -1 +0,0 @@ -../acorgrub \ No newline at end of file diff --git a/Lxde32/acorhooks/live/0030-user-setup b/Lxde32/acorhooks/live/0030-user-setup deleted file mode 100755 index 141ab32..0000000 --- a/Lxde32/acorhooks/live/0030-user-setup +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/sh - -. /lib/live/config.sh - -## live-config(7) - System Configuration Components -## Copyright (C) 2016-2020 The Debian Live team -## Copyright (C) 2006-2015 Daniel Baumann -## -## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. -## This is free software, and you are welcome to redistribute it -## under certain conditions; see COPYING for details. - - -#set -e - -Cmdline () -{ - # Reading kernel command line - for _PARAMETER in ${LIVE_CONFIG_CMDLINE} - do - case "${_PARAMETER}" in - live-config.user-default-groups=*|user-default-groups=*) - LIVE_USER_DEFAULT_GROUPS="${_PARAMETER#*user-default-groups=}" - ;; - - live-config.user-fullname=*|user-fullname=*) - LIVE_USER_FULLNAME="${_PARAMETER#*user-fullname=}" - ;; - - live-config.username=*|username=*) - LIVE_USERNAME="${_PARAMETER#*username=}" - ;; - esac - done -} - -Init () -{ - # Checking if package is installed or already configured - if ! pkg_is_installed "user-setup" || \ - component_was_executed "user-setup" - then - exit 0 - fi - - echo -n " user-setup" -} - -Config () -{ - # Checking if package is already configured differently - if grep -q "^${LIVE_USERNAME}:" /etc/passwd - then - exit 0 - fi - - # Adjust formating of groups - if [ -n "${LIVE_USER_DEFAULT_GROUPS}" ] - then - LIVE_USER_DEFAULT_GROUPS="$(echo ${LIVE_USER_DEFAULT_GROUPS} | sed -e 's|,| |g')" - fi - - # Make sure user is not in sudo group if sudo is disabled - case "${LIVE_CONFIG_NOROOT}" in - true) - LIVE_USER_DEFAULT_GROUPS="$(echo ${LIVE_USER_DEFAULT_GROUPS} | sed -e 's|sudo||')" - ;; - esac - - # Default password is: live - # passwords can be generated with 'echo "live" | mkpasswd -s', - # a blank password is 'U6aMy0wojraho'. -# _PASSWORD="8Ab05sVQ4LLps" - _PASSWORD="U6aMy0wojraho" - -cat > /tmp/live-config.cfg << EOF -user-setup passwd/make-user boolean true -user-setup passwd/root-password-crypted string * -user-setup passwd/user-password-crypted string ${_PASSWORD} -user-setup passwd/user-default-groups string ${LIVE_USER_DEFAULT_GROUPS} -user-setup passwd/user-fullname string ${LIVE_USER_FULLNAME} -user-setup passwd/username string ${LIVE_USERNAME} -user-setup passwd/user-uid string 1000 -EOF - - debconf-set-selections < /tmp/live-config.cfg - rm -f /tmp/live-config.cfg - - # Workaround for bug in shadow - set +e - /usr/lib/user-setup/user-setup-apply 2>&1 \ - | grep -v "Shadow passwords are now on" - set -e - - # Creating state file - touch /var/lib/live/config/user-setup -} - -Cmdline -Init -Config diff --git a/Lxde32/acorhooks/normal/0520-applications.hook.chroot b/Lxde32/acorhooks/normal/0520-applications.hook.chroot deleted file mode 100755 index 85290b6..0000000 --- a/Lxde32/acorhooks/normal/0520-applications.hook.chroot +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -### Error checking added to "lint-trap" section. -### Missing files no longer cause builds to fail. - -# 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 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. - -for i in \ -/usr/share/applications/lxde-x-www-browser.desktop \ -/usr/share/applications/org.kde.kde5.desktop \ -/usr/share/applications/acoroslocale-im.desktop \ -/etc/alternatives/vi \ - - do [ -e $i ] && - rm -rf ${i} || - echo " The path ${i} was not found and couldn't be removed." - done - - -# Lowers the footprint in RAM at the small expense of added size to the ISO. -update-icon-caches /usr/share/icons/* - -#add flatpak repo to gnome-software -flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo - -#add-architecture i386 -dpkg --add-architecture i386 - -### Fixes the "Not installing grub for UEFI Secure Boot" in all versions , after the default was changed. -#sed s/keyutils/"keyutils --install-recommends"/ /usr/sbin/bootloader-config > /tmp/bootloader-config -echo -e "$(grep -A1 -B20 "Installing grub-efi (uefi)..." /usr/sbin/bootloader-config) --install-recommends" > /tmp/bootloader-config -echo -e "$(grep -A2 "else" /usr/sbin/bootloader-config) --install-recommends\nfi" >> /tmp/bootloader-config -chmod +x /tmp/bootloader-config && mv /tmp/bootloader-config /usr/sbin/bootloader-config diff --git a/Lxde32/acorhooks/normal/0600-snap-show-menu-fix.hook.chroot b/Lxde32/acorhooks/normal/0600-snap-show-menu-fix.hook.chroot deleted file mode 100755 index 81056ad..0000000 --- a/Lxde32/acorhooks/normal/0600-snap-show-menu-fix.hook.chroot +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -# Workaround for using snapd on debian. Thank You - @stevesveryown and peppermint team.. -[ ! -e /etc/skel/.local/share ] && mkdir -p /etc/skel/.local/share -[ ! -e /var/lib/snapd/desktop/applications ] && -mkdir -p /var/lib/snapd/desktop/applications && -chmod 777 /var/lib/snapd/desktop/applications -ln -s /var/lib/snapd/desktop/applications /etc/skel/.local/share/applications -ln -s snap /usr/bin/snap-store - - diff --git a/Lxde32/acorlightdm b/Lxde32/acorlightdm deleted file mode 120000 index 85c8ff7..0000000 --- a/Lxde32/acorlightdm +++ /dev/null @@ -1 +0,0 @@ -../acorlightdm \ No newline at end of file diff --git a/Lxde32/acorprofile b/Lxde32/acorprofile deleted file mode 120000 index 29d1f75..0000000 --- a/Lxde32/acorprofile +++ /dev/null @@ -1 +0,0 @@ -../acorprofile \ No newline at end of file diff --git a/Lxde32/acorrepos b/Lxde32/acorrepos deleted file mode 120000 index c3e5c40..0000000 --- a/Lxde32/acorrepos +++ /dev/null @@ -1 +0,0 @@ -../acorrepos \ No newline at end of file diff --git a/Lxde32/acoruserconfig b/Lxde32/acoruserconfig deleted file mode 120000 index 486688c..0000000 --- a/Lxde32/acoruserconfig +++ /dev/null @@ -1 +0,0 @@ -../acoruserconfig \ No newline at end of file diff --git a/Lxde32/build.sh b/Lxde32/build.sh deleted file mode 100755 index c176cff..0000000 --- a/Lxde32/build.sh +++ /dev/null @@ -1,252 +0,0 @@ -#!/bin/bash -PATH="/sbin:/usr/sbin:/usr/local/sbin:$PATH" - -# Set the working folder variable -acorbuild="$(pwd)" - - -# Create the build folder, move into it removing stale mountpoints and files there. -[ -e build ] && [ ! -d build ] && rm -f build || [ ! -e build ] && mkdir build -cd build -umount $(mount | grep "${PWD}/chroot" | tac | cut -f3 -d" ") 2>/dev/null -for i in ./* ./.build ./cache/bootstrap ; do [ $i = ./cache ] && continue || rm -rf $i ; done - - -# Set of the structure to be used for the ISO and Live system. -# See /usr/lib/live/build/config for a full list of examples. -# Up above is the manual description of what options I used so far. - - lb config noauto \ - --binary-images iso-hybrid \ - --mode debian \ - --architectures i386 \ - --linux-flavours 686-pae \ - --distribution bookworm \ - --archive-areas "main contrib non-free non-free-firmware" \ - --mirror-bootstrap https://deb.debian.org/debian \ - --parent-mirror-bootstrap https://deb.debian.org/debian \ - --parent-mirror-chroot https://deb.debian.org/debian \ - --parent-mirror-chroot-security https://security.debian.org/debian-security \ - --parent-mirror-binary https://deb.debian.org/debian \ - --parent-mirror-binary-security https://security.debian.org/debian-security \ - --mirror-chroot https://deb.debian.org/debian \ - --mirror-chroot-security https://security.debian.org/debian-security \ - --uefi-secure-boot enable \ - --updates true \ - --security true \ - --backports false \ - --cache true \ - --apt-recommends true \ - --iso-application AcorOS \ - --win32-loader false \ - --iso-preparer acoros-https://sourceforge.net/projects/acor-os/ \ - --iso-publisher acoros-https://sourceforge.net/projects/acor-os/ \ - --iso-volume AcorOS \ - --image-name "AcorOS" \ - --win32-loader false \ - --checksums sha512 \ - --zsync false \ - "${@}" - -# Install the Lxde Desktop -mkdir -p $acorbuild/build/config/package-lists -echo lxde > $acorbuild/build/config/package-lists/desktop.list.chroot - -# Install software -echo "# Install software to the squashfs for calamares to unpack to the OS. -linux-headers-686-pae -locales -nala -dbus-x11 -ntp -acoros-keyring -xorg -xserver-xorg -xserver-xorg-input-synaptics -xserver-xorg-input-all -xserver-xorg-video-vmware -xserver-xorg-video-all -w32codecs -ffmpeg -sox -twolame -lame -faad -gstreamer1.0-plugins-good -gstreamer1.0-plugins-ugly -gstreamer1.0-plugins-bad -gstreamer1.0-pulseaudio -unrar -rar -p7zip-full -p7zip-rar -zip -unzip -pulseaudio -pavucontrol -alsa-utils -aptitude -synaptic -gparted -apt-config-auto-update -libelf-dev -htop -package-update-indicator -desktop-base -gnome-packagekit -gvfs-backends -samba -gnome-packagekit -iso-flag-png -sambashare -network-manager -network-manager-gnome -bluez -blueman -gufw -acoros-icons -numix-gtk-theme -orchis-gtk-theme -darc-aurora-gtk-theme -blue-papirus-icons -brown-papirus-icons -papirus-dark-grey -papirus-icon-theme -gtk2-engines -acoros-backgrounds -plymouth -plymouth-themes -cups -system-config-printer -lightdm -lightdm-gtk-greeter -lightdm-gtk-greeter-settings -acoros-lxde-configs -menulibre -mugshot -xscreensaver -xscreensaver-data -xscreensaver-data-extra -xscreensaver-gl -xscreensaver-gl-extra -gnome-system-tools -gnome-disk-utility -gnome-calculator -neofetch -accountsservice -catfish -timeshift -compton -compton-conf -gnome-software -gnome-software-plugin-flatpak -gnome-software-plugin-snap -fwupd -bleachbit -dconf-editor -gimp -gimp-data-extras -evince -xsane -transmission-gtk -thunderbird -thunderbird-l10n-pt-br -thunderbird-l10n-pt-pt -thunderbird-l10n-de -thunderbird-l10n-en-gb -thunderbird-l10n-es-es -thunderbird-l10n-fr -thunderbird-l10n-it -chromium -chromium-l10n -libreoffice -libreoffice-gtk3 -libreoffice-l10n-pt -libreoffice-l10n-pt-br -libreoffice-l10n-de -libreoffice-l10n-en-gb -libreoffice-l10n-es -libreoffice-l10n-fr -libreoffice-l10n-it -printer-driver-cups-pdf -gnome-2048 -gnome-chess -gnome-mahjongg -gnome-sudoku -guvcview -vlc -xfburn -qt5-style-plugins -qt5ct -calamares-settings-acoros-32 -calamares -gdebi -f2fs-tools -xfsprogs -xfsdump -grub-pc - -" > $acorbuild/build/config/package-lists/packages.list.chroot - - -# Packages to be stored in /pool but not installed in the OS . -echo "# These packages are available to the installer, for offline use. -efibootmgr -grub2-common -grub-efi-ia32 -grub-efi-ia32-bin -grub-efi-ia32-signed -libefiboot1 -libefivar1 -mokutil -os-prober -shim-helpers-i386-signed -shim-signed -shim-signed-common -shim-unsigned - -" > $acorbuild/build/config/package-lists/installer.list.binary - - -# Setup the chroot structure -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/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 -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/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 -ln -s debian.csv $acorbuild/build/config/includes.chroot/usr/share/distro-info/acoros.csv -ln -s acoros $acorbuild/build/config/includes.chroot/etc/dpkg/origins/default - - -# Build the ISO # -lb build #--debug --verbose - - diff --git a/Mate/acorhooks/normal/0520-applications.hook.chroot b/Mate/acorhooks/normal/0520-applications.hook.chroot index d237bb3..32e0468 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 termit raspi-firmware +apt --purge --yes autoremove vim vim-tiny gnome-system-monitor hv3 mpv murrine-themes konsole malcontent termit raspi-firmware systemsettings ## This section is the "lint-trap" to remove files and/or diff --git a/Xfce/acorhooks/normal/0520-applications.hook.chroot b/Xfce/acorhooks/normal/0520-applications.hook.chroot index aa5e71d..c2e5f07 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 raspi-firmware +apt --purge --yes autoremove vim vim-tiny nautilus hv3 mpv murrine-themes konsole malcontent termit raspi-firmware systemsettings ## This section is the "lint-trap" to remove files and/or ## directories not associated with or required by AcorOS. diff --git a/Xfce32/acorhooks/normal/0520-applications.hook.chroot b/Xfce32/acorhooks/normal/0520-applications.hook.chroot index 67758a0..d3cc45e 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 raspi-firmware +apt --purge --yes autoremove vim vim-tiny nautilus hv3 mpv murrine-themes konsole malcontent termit raspi-firmware systemsettings ## This section is the "lint-trap" to remove files and/or ## directories not associated with or required by AcorOS.