diff --git a/BldHelper-release.sh b/BldHelper-release.sh deleted file mode 100755 index a73067db..00000000 --- a/BldHelper-release.sh +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/bash - -# BldHelper-release.sh -# This script is meant to be run on the build server and expects to find and update itself from adjacent repos. -# From PepDistroConfigs, these repos are ../PepProPixMaps & ../PepProTools and are vital to having a working build. - -### ## # Set build working variables HERE # ## ### - -PREFIX=My-distro-ubuntu # Sets a unique final name of the ISO and checksum so only removes 2 files . -SUFFIX=amd64 # Also used by . And to distinguish between amd64 and x86 or devuan and ubuntu . -BUILD=release # Sets which pepbld.sh to use and the location in /var/www/html/[release|rc|testing|nightly|unstable] - -################################################## -### ## # Make NO Edits Below This Line !! # ## ### -################################################## - -[ $TODAY ! = " " ] || TODAY=$(date -u +"%Y-%m-%d") # If MasterBuilder.sh is used IT will set the date. If not used, we set it here. -FileName="${PREFIX}-${SUFFIX}" # This will give a uniquely named and dated ISO and checksum for . -LOCATION=/var/www/acoroslinux.tk/iso-builds/${BUILD} # Tells and the script which 2 files to remove and where to put them. -LogDir=/repos/builds/my-distro-builds/logs/ # This folder contains a log for the last $[PREFIX]-$[SUFFIX] build. -WorkDir=/repos/builds/my-distro-builds/ # * If we change servers or locations T*H*I*S line is the O*N*L*Y line to change. * -_break=0 ; _wait=30 # Time (in seconds) to wait - -# Move into the builder directory. -# Make sure the local repos are up to date. -cd /repos/builds/my-distro-builds/ -cd ./My-distro-configs-ubuntu && git pull --ff-only - -# Run the build script - expect 50 minutes, allow 60. - ./build.sh 2>&1 | tee -a /tmp/${FileName}.out - - -# Timing matters, don't destroy the old one without a replacement. -# Check for the ISO to appear and wait for things to settle. -until [ -e build/*.iso ] - do ((++_break)) - [ $_break -gt $_wait ] && break || sleep 1 -done - -if [ ${_break} -lt ${_wait} ] ; then -### 10 June, 2022 - After 17 June, this comment and the following line can be removed -echo -e "\n\tISO appeared after $_break seconds.\n" | tee --append /tmp/${FileName}.out - -mv build/*.iso build/${FileName}.iso - -# Make the checksum file. -cd build -echo "# ${FileName} ${TODAY}" > ${FileName}-sha512.checksum -sha512sum ${FileName}.iso >> ${FileName}-sha512.checksum - -### -# Remove the previous files in ${LOCATION} . -rm -f ${LOCATION}/${FileName}*.iso -rm -f ${LOCATION}/${FileName}*-sha512.checksum - -#mv $(FileName}* ${LOCATION}/ -mv ${FileName}.iso ${LOCATION}/${FileName}.iso -mv ${FileName}-sha512.checksum ${LOCATION}/${FileName}-sha512.checksum - -# touch -t ${_stamp} ${LOCATION} ${LOCATION}/${FileName}* -touch ${LOCATION}/${FileName}* - -lb clean & - -# Move the log file to the log directory. -[ ! -e ${LogDir} ] && mkdir -p ${LogDir} -mv /tmp/${FileName}.out ${LogDir}/${FileName}-${BUILD}.log -### - -else echo -e "\n\tAfter $_break seconds, ISO never appeared.\n" | tee --append /tmp/${FileName}.out - mv /tmp/${FileName}.out ${LogDir}/${FileName}-${BUILD}.log -fi - diff --git a/BldHelper.sh b/BldHelper.sh new file mode 100755 index 00000000..b62b8f1c --- /dev/null +++ b/BldHelper.sh @@ -0,0 +1,50 @@ +#!/bin/bash + +################################################################################ +# Title: Bldhelper.sh +# Description: Script to build My-distro ISO image +# Author: manuel rosa +# Date: Outubro 29, 2023 +# License: GPL-3.0-or-later +################################################################################ + +# Set environment variables +PREFIX=My-distro-ubuntu +SUFFIX=amd64 +BUILD=ubuntu-64 +FileName="${PREFIX}-${SUFFIX}" +LOCATION=$HOME/out/${BUILD} +LogDir=$HOME/logs +WorkingDir=$HOME/My-distro-configs-ubuntu + +# 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/bootloaders/grub-pc/config.cfg b/bootloaders/boot/grub/config.cfg similarity index 100% rename from bootloaders/grub-pc/config.cfg rename to bootloaders/boot/grub/config.cfg diff --git a/bootloaders/grub-pc/dejavu-bold-14.pf2 b/bootloaders/boot/grub/dejavu-bold-14.pf2 similarity index 100% rename from bootloaders/grub-pc/dejavu-bold-14.pf2 rename to bootloaders/boot/grub/dejavu-bold-14.pf2 diff --git a/bootloaders/grub-pc/dejavu-bold-16.pf2 b/bootloaders/boot/grub/dejavu-bold-16.pf2 similarity index 100% rename from bootloaders/grub-pc/dejavu-bold-16.pf2 rename to bootloaders/boot/grub/dejavu-bold-16.pf2 diff --git a/bootloaders/grub-pc/font.pf2 b/bootloaders/boot/grub/font.pf2 similarity index 100% rename from bootloaders/grub-pc/font.pf2 rename to bootloaders/boot/grub/font.pf2 diff --git a/bootloaders/grub-pc/grub.cfg b/bootloaders/boot/grub/grub.cfg similarity index 91% rename from bootloaders/grub-pc/grub.cfg rename to bootloaders/boot/grub/grub.cfg index 37dcd573..e3b40030 100644 --- a/bootloaders/grub-pc/grub.cfg +++ b/bootloaders/boot/grub/grub.cfg @@ -1,7 +1,7 @@ source /boot/grub/config.cfg menuentry "My-distro Live" { - linux /live/vmlinuz boot=live components splash quiet locales=pt_PT.UTF-8 keyboard-layouts=pt username=user hostname=My-distro timezone=atlantic/azores autologin "${loopback}" + linux /live/vmlinuz boot=live components splash quiet username=user hostname=My-distro autologin "${loopback}" initrd /live/initrd.img } menuentry "My-distro Live (fail-safe mode)" { diff --git a/bootloaders/grub-pc/live-theme/background.png b/bootloaders/boot/grub/live-theme/background.png similarity index 100% rename from bootloaders/grub-pc/live-theme/background.png rename to bootloaders/boot/grub/live-theme/background.png diff --git a/bootloaders/grub-pc/live-theme/icons/4MLinux.png b/bootloaders/boot/grub/live-theme/icons/4MLinux.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/4MLinux.png rename to bootloaders/boot/grub/live-theme/icons/4MLinux.png diff --git a/bootloaders/grub-pc/live-theme/icons/AlpineLinux.png b/bootloaders/boot/grub/live-theme/icons/AlpineLinux.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/AlpineLinux.png rename to bootloaders/boot/grub/live-theme/icons/AlpineLinux.png diff --git a/bootloaders/grub-pc/live-theme/icons/Manjaro.i686.png b/bootloaders/boot/grub/live-theme/icons/Manjaro.i686.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/Manjaro.i686.png rename to bootloaders/boot/grub/live-theme/icons/Manjaro.i686.png diff --git a/bootloaders/grub-pc/live-theme/icons/Manjaro.x86_64.png b/bootloaders/boot/grub/live-theme/icons/Manjaro.x86_64.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/Manjaro.x86_64.png rename to bootloaders/boot/grub/live-theme/icons/Manjaro.x86_64.png diff --git a/bootloaders/grub-pc/live-theme/icons/SystemRescueCD.png b/bootloaders/boot/grub/live-theme/icons/SystemRescueCD.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/SystemRescueCD.png rename to bootloaders/boot/grub/live-theme/icons/SystemRescueCD.png diff --git a/bootloaders/grub-pc/live-theme/icons/android.png b/bootloaders/boot/grub/live-theme/icons/android.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/android.png rename to bootloaders/boot/grub/live-theme/icons/android.png diff --git a/bootloaders/grub-pc/live-theme/icons/anonymous.png b/bootloaders/boot/grub/live-theme/icons/anonymous.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/anonymous.png rename to bootloaders/boot/grub/live-theme/icons/anonymous.png diff --git a/bootloaders/grub-pc/live-theme/icons/antergos.png b/bootloaders/boot/grub/live-theme/icons/antergos.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/antergos.png rename to bootloaders/boot/grub/live-theme/icons/antergos.png diff --git a/bootloaders/grub-pc/live-theme/icons/arch.png b/bootloaders/boot/grub/live-theme/icons/arch.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/arch.png rename to bootloaders/boot/grub/live-theme/icons/arch.png diff --git a/bootloaders/grub-pc/live-theme/icons/archlinux.png b/bootloaders/boot/grub/live-theme/icons/archlinux.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/archlinux.png rename to bootloaders/boot/grub/live-theme/icons/archlinux.png diff --git a/bootloaders/grub-pc/live-theme/icons/arcolinux.png b/bootloaders/boot/grub/live-theme/icons/arcolinux.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/arcolinux.png rename to bootloaders/boot/grub/live-theme/icons/arcolinux.png diff --git a/bootloaders/grub-pc/live-theme/icons/artix.png b/bootloaders/boot/grub/live-theme/icons/artix.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/artix.png rename to bootloaders/boot/grub/live-theme/icons/artix.png diff --git a/bootloaders/grub-pc/live-theme/icons/bedrock.png b/bootloaders/boot/grub/live-theme/icons/bedrock.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/bedrock.png rename to bootloaders/boot/grub/live-theme/icons/bedrock.png diff --git a/bootloaders/grub-pc/live-theme/icons/cancel.png b/bootloaders/boot/grub/live-theme/icons/cancel.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/cancel.png rename to bootloaders/boot/grub/live-theme/icons/cancel.png diff --git a/bootloaders/grub-pc/live-theme/icons/centos.png b/bootloaders/boot/grub/live-theme/icons/centos.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/centos.png rename to bootloaders/boot/grub/live-theme/icons/centos.png diff --git a/bootloaders/grub-pc/live-theme/icons/chakra.png b/bootloaders/boot/grub/live-theme/icons/chakra.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/chakra.png rename to bootloaders/boot/grub/live-theme/icons/chakra.png diff --git a/bootloaders/grub-pc/live-theme/icons/debian.png b/bootloaders/boot/grub/live-theme/icons/debian.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/debian.png rename to bootloaders/boot/grub/live-theme/icons/debian.png diff --git a/bootloaders/grub-pc/live-theme/icons/deepin.png b/bootloaders/boot/grub/live-theme/icons/deepin.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/deepin.png rename to bootloaders/boot/grub/live-theme/icons/deepin.png diff --git a/bootloaders/grub-pc/live-theme/icons/devuan.png b/bootloaders/boot/grub/live-theme/icons/devuan.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/devuan.png rename to bootloaders/boot/grub/live-theme/icons/devuan.png diff --git a/bootloaders/grub-pc/live-theme/icons/driver.png b/bootloaders/boot/grub/live-theme/icons/driver.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/driver.png rename to bootloaders/boot/grub/live-theme/icons/driver.png diff --git a/bootloaders/grub-pc/live-theme/icons/edit.png b/bootloaders/boot/grub/live-theme/icons/edit.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/edit.png rename to bootloaders/boot/grub/live-theme/icons/edit.png diff --git a/bootloaders/grub-pc/live-theme/icons/efi.png b/bootloaders/boot/grub/live-theme/icons/efi.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/efi.png rename to bootloaders/boot/grub/live-theme/icons/efi.png diff --git a/bootloaders/grub-pc/live-theme/icons/elementary.png b/bootloaders/boot/grub/live-theme/icons/elementary.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/elementary.png rename to bootloaders/boot/grub/live-theme/icons/elementary.png diff --git a/bootloaders/grub-pc/live-theme/icons/endeavouros.png b/bootloaders/boot/grub/live-theme/icons/endeavouros.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/endeavouros.png rename to bootloaders/boot/grub/live-theme/icons/endeavouros.png diff --git a/bootloaders/grub-pc/live-theme/icons/fedora.png b/bootloaders/boot/grub/live-theme/icons/fedora.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/fedora.png rename to bootloaders/boot/grub/live-theme/icons/fedora.png diff --git a/bootloaders/grub-pc/live-theme/icons/find.efi.png b/bootloaders/boot/grub/live-theme/icons/find.efi.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/find.efi.png rename to bootloaders/boot/grub/live-theme/icons/find.efi.png diff --git a/bootloaders/grub-pc/live-theme/icons/find.none.png b/bootloaders/boot/grub/live-theme/icons/find.none.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/find.none.png rename to bootloaders/boot/grub/live-theme/icons/find.none.png diff --git a/bootloaders/grub-pc/live-theme/icons/freebsd.png b/bootloaders/boot/grub/live-theme/icons/freebsd.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/freebsd.png rename to bootloaders/boot/grub/live-theme/icons/freebsd.png diff --git a/bootloaders/grub-pc/live-theme/icons/garuda.png b/bootloaders/boot/grub/live-theme/icons/garuda.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/garuda.png rename to bootloaders/boot/grub/live-theme/icons/garuda.png diff --git a/bootloaders/grub-pc/live-theme/icons/gentoo.png b/bootloaders/boot/grub/live-theme/icons/gentoo.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/gentoo.png rename to bootloaders/boot/grub/live-theme/icons/gentoo.png diff --git a/bootloaders/grub-pc/live-theme/icons/gnu-linux.png b/bootloaders/boot/grub/live-theme/icons/gnu-linux.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/gnu-linux.png rename to bootloaders/boot/grub/live-theme/icons/gnu-linux.png diff --git a/bootloaders/grub-pc/live-theme/icons/haiku.png b/bootloaders/boot/grub/live-theme/icons/haiku.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/haiku.png rename to bootloaders/boot/grub/live-theme/icons/haiku.png diff --git a/bootloaders/grub-pc/live-theme/icons/help.png b/bootloaders/boot/grub/live-theme/icons/help.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/help.png rename to bootloaders/boot/grub/live-theme/icons/help.png diff --git a/bootloaders/grub-pc/live-theme/icons/kali.png b/bootloaders/boot/grub/live-theme/icons/kali.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/kali.png rename to bootloaders/boot/grub/live-theme/icons/kali.png diff --git a/bootloaders/grub-pc/live-theme/icons/kaos.png b/bootloaders/boot/grub/live-theme/icons/kaos.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/kaos.png rename to bootloaders/boot/grub/live-theme/icons/kaos.png diff --git a/bootloaders/grub-pc/live-theme/icons/kbd.png b/bootloaders/boot/grub/live-theme/icons/kbd.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/kbd.png rename to bootloaders/boot/grub/live-theme/icons/kbd.png diff --git a/bootloaders/grub-pc/live-theme/icons/korora.png b/bootloaders/boot/grub/live-theme/icons/korora.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/korora.png rename to bootloaders/boot/grub/live-theme/icons/korora.png diff --git a/bootloaders/grub-pc/live-theme/icons/kubuntu.png b/bootloaders/boot/grub/live-theme/icons/kubuntu.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/kubuntu.png rename to bootloaders/boot/grub/live-theme/icons/kubuntu.png diff --git a/bootloaders/grub-pc/live-theme/icons/lang.png b/bootloaders/boot/grub/live-theme/icons/lang.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/lang.png rename to bootloaders/boot/grub/live-theme/icons/lang.png diff --git a/bootloaders/grub-pc/live-theme/icons/lfs.png b/bootloaders/boot/grub/live-theme/icons/lfs.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/lfs.png rename to bootloaders/boot/grub/live-theme/icons/lfs.png diff --git a/bootloaders/grub-pc/live-theme/icons/linux.png b/bootloaders/boot/grub/live-theme/icons/linux.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/linux.png rename to bootloaders/boot/grub/live-theme/icons/linux.png diff --git a/bootloaders/grub-pc/live-theme/icons/linuxmint.png b/bootloaders/boot/grub/live-theme/icons/linuxmint.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/linuxmint.png rename to bootloaders/boot/grub/live-theme/icons/linuxmint.png diff --git a/bootloaders/grub-pc/live-theme/icons/lubuntu.png b/bootloaders/boot/grub/live-theme/icons/lubuntu.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/lubuntu.png rename to bootloaders/boot/grub/live-theme/icons/lubuntu.png diff --git a/bootloaders/grub-pc/live-theme/icons/macosx.png b/bootloaders/boot/grub/live-theme/icons/macosx.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/macosx.png rename to bootloaders/boot/grub/live-theme/icons/macosx.png diff --git a/bootloaders/grub-pc/live-theme/icons/mageia.png b/bootloaders/boot/grub/live-theme/icons/mageia.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/mageia.png rename to bootloaders/boot/grub/live-theme/icons/mageia.png diff --git a/bootloaders/grub-pc/live-theme/icons/manjaro.png b/bootloaders/boot/grub/live-theme/icons/manjaro.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/manjaro.png rename to bootloaders/boot/grub/live-theme/icons/manjaro.png diff --git a/bootloaders/grub-pc/live-theme/icons/mate.png b/bootloaders/boot/grub/live-theme/icons/mate.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/mate.png rename to bootloaders/boot/grub/live-theme/icons/mate.png diff --git a/bootloaders/grub-pc/live-theme/icons/memtest.png b/bootloaders/boot/grub/live-theme/icons/memtest.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/memtest.png rename to bootloaders/boot/grub/live-theme/icons/memtest.png diff --git a/bootloaders/grub-pc/live-theme/icons/mx-linux.png b/bootloaders/boot/grub/live-theme/icons/mx-linux.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/mx-linux.png rename to bootloaders/boot/grub/live-theme/icons/mx-linux.png diff --git a/bootloaders/grub-pc/live-theme/icons/neon.png b/bootloaders/boot/grub/live-theme/icons/neon.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/neon.png rename to bootloaders/boot/grub/live-theme/icons/neon.png diff --git a/bootloaders/grub-pc/live-theme/icons/opensuse.png b/bootloaders/boot/grub/live-theme/icons/opensuse.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/opensuse.png rename to bootloaders/boot/grub/live-theme/icons/opensuse.png diff --git a/bootloaders/grub-pc/live-theme/icons/parrot.png b/bootloaders/boot/grub/live-theme/icons/parrot.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/parrot.png rename to bootloaders/boot/grub/live-theme/icons/parrot.png diff --git a/bootloaders/grub-pc/live-theme/icons/pop-os.png b/bootloaders/boot/grub/live-theme/icons/pop-os.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/pop-os.png rename to bootloaders/boot/grub/live-theme/icons/pop-os.png diff --git a/bootloaders/grub-pc/live-theme/icons/pop.png b/bootloaders/boot/grub/live-theme/icons/pop.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/pop.png rename to bootloaders/boot/grub/live-theme/icons/pop.png diff --git a/bootloaders/grub-pc/live-theme/icons/recovery.png b/bootloaders/boot/grub/live-theme/icons/recovery.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/recovery.png rename to bootloaders/boot/grub/live-theme/icons/recovery.png diff --git a/bootloaders/grub-pc/live-theme/icons/regolith.png b/bootloaders/boot/grub/live-theme/icons/regolith.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/regolith.png rename to bootloaders/boot/grub/live-theme/icons/regolith.png diff --git a/bootloaders/grub-pc/live-theme/icons/restart.png b/bootloaders/boot/grub/live-theme/icons/restart.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/restart.png rename to bootloaders/boot/grub/live-theme/icons/restart.png diff --git a/bootloaders/grub-pc/live-theme/icons/rocky.png b/bootloaders/boot/grub/live-theme/icons/rocky.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/rocky.png rename to bootloaders/boot/grub/live-theme/icons/rocky.png diff --git a/bootloaders/grub-pc/live-theme/icons/shutdown.png b/bootloaders/boot/grub/live-theme/icons/shutdown.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/shutdown.png rename to bootloaders/boot/grub/live-theme/icons/shutdown.png diff --git a/bootloaders/grub-pc/live-theme/icons/siduction.png b/bootloaders/boot/grub/live-theme/icons/siduction.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/siduction.png rename to bootloaders/boot/grub/live-theme/icons/siduction.png diff --git a/bootloaders/grub-pc/live-theme/icons/slackware.png b/bootloaders/boot/grub/live-theme/icons/slackware.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/slackware.png rename to bootloaders/boot/grub/live-theme/icons/slackware.png diff --git a/bootloaders/grub-pc/live-theme/icons/solus.png b/bootloaders/boot/grub/live-theme/icons/solus.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/solus.png rename to bootloaders/boot/grub/live-theme/icons/solus.png diff --git a/bootloaders/grub-pc/live-theme/icons/steamos.png b/bootloaders/boot/grub/live-theme/icons/steamos.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/steamos.png rename to bootloaders/boot/grub/live-theme/icons/steamos.png diff --git a/bootloaders/grub-pc/live-theme/icons/type.png b/bootloaders/boot/grub/live-theme/icons/type.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/type.png rename to bootloaders/boot/grub/live-theme/icons/type.png diff --git a/bootloaders/grub-pc/live-theme/icons/tz.png b/bootloaders/boot/grub/live-theme/icons/tz.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/tz.png rename to bootloaders/boot/grub/live-theme/icons/tz.png diff --git a/bootloaders/grub-pc/live-theme/icons/ubuntu.png b/bootloaders/boot/grub/live-theme/icons/ubuntu.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/ubuntu.png rename to bootloaders/boot/grub/live-theme/icons/ubuntu.png diff --git a/bootloaders/grub-pc/live-theme/icons/unknown.png b/bootloaders/boot/grub/live-theme/icons/unknown.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/unknown.png rename to bootloaders/boot/grub/live-theme/icons/unknown.png diff --git a/bootloaders/grub-pc/live-theme/icons/unset.png b/bootloaders/boot/grub/live-theme/icons/unset.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/unset.png rename to bootloaders/boot/grub/live-theme/icons/unset.png diff --git a/bootloaders/grub-pc/live-theme/icons/ventoy.png b/bootloaders/boot/grub/live-theme/icons/ventoy.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/ventoy.png rename to bootloaders/boot/grub/live-theme/icons/ventoy.png diff --git a/bootloaders/grub-pc/live-theme/icons/void.png b/bootloaders/boot/grub/live-theme/icons/void.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/void.png rename to bootloaders/boot/grub/live-theme/icons/void.png diff --git a/bootloaders/grub-pc/live-theme/icons/windows.png b/bootloaders/boot/grub/live-theme/icons/windows.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/windows.png rename to bootloaders/boot/grub/live-theme/icons/windows.png diff --git a/bootloaders/grub-pc/live-theme/icons/windows11.png b/bootloaders/boot/grub/live-theme/icons/windows11.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/windows11.png rename to bootloaders/boot/grub/live-theme/icons/windows11.png diff --git a/bootloaders/grub-pc/live-theme/icons/xero.png b/bootloaders/boot/grub/live-theme/icons/xero.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/xero.png rename to bootloaders/boot/grub/live-theme/icons/xero.png diff --git a/bootloaders/grub-pc/live-theme/icons/xerolinux.png b/bootloaders/boot/grub/live-theme/icons/xerolinux.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/xerolinux.png rename to bootloaders/boot/grub/live-theme/icons/xerolinux.png diff --git a/bootloaders/grub-pc/live-theme/icons/xubuntu.png b/bootloaders/boot/grub/live-theme/icons/xubuntu.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/xubuntu.png rename to bootloaders/boot/grub/live-theme/icons/xubuntu.png diff --git a/bootloaders/grub-pc/live-theme/icons/zorin.png b/bootloaders/boot/grub/live-theme/icons/zorin.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/zorin.png rename to bootloaders/boot/grub/live-theme/icons/zorin.png diff --git a/bootloaders/grub-pc/live-theme/select_c.png b/bootloaders/boot/grub/live-theme/select_c.png similarity index 100% rename from bootloaders/grub-pc/live-theme/select_c.png rename to bootloaders/boot/grub/live-theme/select_c.png diff --git a/bootloaders/grub-pc/live-theme/select_e.png b/bootloaders/boot/grub/live-theme/select_e.png similarity index 100% rename from bootloaders/grub-pc/live-theme/select_e.png rename to bootloaders/boot/grub/live-theme/select_e.png diff --git a/bootloaders/grub-pc/live-theme/select_w.png b/bootloaders/boot/grub/live-theme/select_w.png similarity index 100% rename from bootloaders/grub-pc/live-theme/select_w.png rename to bootloaders/boot/grub/live-theme/select_w.png diff --git a/bootloaders/grub-pc/live-theme/terminal_box_c.png b/bootloaders/boot/grub/live-theme/terminal_box_c.png similarity index 100% rename from bootloaders/grub-pc/live-theme/terminal_box_c.png rename to bootloaders/boot/grub/live-theme/terminal_box_c.png diff --git a/bootloaders/grub-pc/live-theme/terminal_box_e.png b/bootloaders/boot/grub/live-theme/terminal_box_e.png similarity index 100% rename from bootloaders/grub-pc/live-theme/terminal_box_e.png rename to bootloaders/boot/grub/live-theme/terminal_box_e.png diff --git a/bootloaders/grub-pc/live-theme/terminal_box_n.png b/bootloaders/boot/grub/live-theme/terminal_box_n.png similarity index 100% rename from bootloaders/grub-pc/live-theme/terminal_box_n.png rename to bootloaders/boot/grub/live-theme/terminal_box_n.png diff --git a/bootloaders/grub-pc/live-theme/terminal_box_ne.png b/bootloaders/boot/grub/live-theme/terminal_box_ne.png similarity index 100% rename from bootloaders/grub-pc/live-theme/terminal_box_ne.png rename to bootloaders/boot/grub/live-theme/terminal_box_ne.png diff --git a/bootloaders/grub-pc/live-theme/terminal_box_nw.png b/bootloaders/boot/grub/live-theme/terminal_box_nw.png similarity index 100% rename from bootloaders/grub-pc/live-theme/terminal_box_nw.png rename to bootloaders/boot/grub/live-theme/terminal_box_nw.png diff --git a/bootloaders/grub-pc/live-theme/terminal_box_s.png b/bootloaders/boot/grub/live-theme/terminal_box_s.png similarity index 100% rename from bootloaders/grub-pc/live-theme/terminal_box_s.png rename to bootloaders/boot/grub/live-theme/terminal_box_s.png diff --git a/bootloaders/grub-pc/live-theme/terminal_box_se.png b/bootloaders/boot/grub/live-theme/terminal_box_se.png similarity index 100% rename from bootloaders/grub-pc/live-theme/terminal_box_se.png rename to bootloaders/boot/grub/live-theme/terminal_box_se.png diff --git a/bootloaders/grub-pc/live-theme/terminal_box_sw.png b/bootloaders/boot/grub/live-theme/terminal_box_sw.png similarity index 100% rename from bootloaders/grub-pc/live-theme/terminal_box_sw.png rename to bootloaders/boot/grub/live-theme/terminal_box_sw.png diff --git a/bootloaders/grub-pc/live-theme/terminal_box_w.png b/bootloaders/boot/grub/live-theme/terminal_box_w.png similarity index 100% rename from bootloaders/grub-pc/live-theme/terminal_box_w.png rename to bootloaders/boot/grub/live-theme/terminal_box_w.png diff --git a/bootloaders/grub-pc/live-theme/terminus-12.pf2 b/bootloaders/boot/grub/live-theme/terminus-12.pf2 similarity index 100% rename from bootloaders/grub-pc/live-theme/terminus-12.pf2 rename to bootloaders/boot/grub/live-theme/terminus-12.pf2 diff --git a/bootloaders/grub-pc/live-theme/terminus-14.pf2 b/bootloaders/boot/grub/live-theme/terminus-14.pf2 similarity index 100% rename from bootloaders/grub-pc/live-theme/terminus-14.pf2 rename to bootloaders/boot/grub/live-theme/terminus-14.pf2 diff --git a/bootloaders/grub-pc/live-theme/terminus-16.pf2 b/bootloaders/boot/grub/live-theme/terminus-16.pf2 similarity index 100% rename from bootloaders/grub-pc/live-theme/terminus-16.pf2 rename to bootloaders/boot/grub/live-theme/terminus-16.pf2 diff --git a/bootloaders/grub-pc/live-theme/terminus-18.pf2 b/bootloaders/boot/grub/live-theme/terminus-18.pf2 similarity index 100% rename from bootloaders/grub-pc/live-theme/terminus-18.pf2 rename to bootloaders/boot/grub/live-theme/terminus-18.pf2 diff --git a/bootloaders/grub-pc/live-theme/theme.txt b/bootloaders/boot/grub/live-theme/theme.txt similarity index 100% rename from bootloaders/grub-pc/live-theme/theme.txt rename to bootloaders/boot/grub/live-theme/theme.txt diff --git a/bootloaders/grub-pc/live-theme/ubuntu_regular_17.pf2 b/bootloaders/boot/grub/live-theme/ubuntu_regular_17.pf2 similarity index 100% rename from bootloaders/grub-pc/live-theme/ubuntu_regular_17.pf2 rename to bootloaders/boot/grub/live-theme/ubuntu_regular_17.pf2 diff --git a/bootloaders/grub-pc/live-theme/ubuntu_regular_20.pf2 b/bootloaders/boot/grub/live-theme/ubuntu_regular_20.pf2 similarity index 100% rename from bootloaders/grub-pc/live-theme/ubuntu_regular_20.pf2 rename to bootloaders/boot/grub/live-theme/ubuntu_regular_20.pf2 diff --git a/bootloaders/grub-pc/loopback.cfg b/bootloaders/boot/grub/loopback.cfg similarity index 100% rename from bootloaders/grub-pc/loopback.cfg rename to bootloaders/boot/grub/loopback.cfg diff --git a/bootloaders/grub-pc/splash.png b/bootloaders/boot/grub/splash.png similarity index 100% rename from bootloaders/grub-pc/splash.png rename to bootloaders/boot/grub/splash.png diff --git a/bootloaders/grub-pc/theme.cfg b/bootloaders/boot/grub/theme.cfg similarity index 100% rename from bootloaders/grub-pc/theme.cfg rename to bootloaders/boot/grub/theme.cfg diff --git a/bootloaders/isolinux/menu.cfg b/bootloaders/isolinux/menu.cfg index 72845759..7126c2cc 100644 --- a/bootloaders/isolinux/menu.cfg +++ b/bootloaders/isolinux/menu.cfg @@ -4,7 +4,7 @@ DEFAULT My-distro Live LABEL My-distro Live SAY "Booting My-distro Live..." linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components splash quiet locales=pt_PT.UTF-8 keyboard-layouts=pt username=user hostname=My-distro timezone=atlantic/azores + APPEND initrd=/live/initrd.img boot=live components splash quiet username=user hostname=My-distro LABEL My-distro live failsafe menu label My-distro Live failsafe diff --git a/build.sh b/build.sh index f7816344..345e582f 100755 --- a/build.sh +++ b/build.sh @@ -1,4 +1,13 @@ #!/bin/bash + +################################################################################ +# Title: build.sh +# Description: Script to build My-distro ISO image +# Author: manuel rosa +# Date: Outubro 29, 2023 +# License: GPL-3.0-or-later +################################################################################ + PATH="/sbin:/usr/sbin:/usr/local/sbin:$PATH" # Set the working folder variable @@ -9,7 +18,7 @@ build="$(pwd)" [ -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 +for i in * .build ; do [ $i = cache ] && continue || rm -rf $i ; done # Set of the structure to be used for the ISO and Live system. @@ -110,6 +119,7 @@ system-config-printer lightdm lightdm-gtk-greeter lightdm-gtk-greeter-settings +lightdm-autologin-greeter menulibre mugshot xscreensaver @@ -182,6 +192,8 @@ ffmpegthumbnailer linux-firmware xterm grub-pc +spice-vdagent +console-setup " > $build/build/config/package-lists/packages.list.chroot @@ -243,15 +255,13 @@ cp $build/bootloader-config/* $build/build/config/includes.chroot/usr/sbin cp $build/grub/grub $build/build/config/includes.chroot/etc/default cp -r $build/lightdm/* $build/build/config/includes.chroot/etc/lightdm -cp -r $build/bootloaders/* $build/build/config/bootloaders +cp -r $build/bootloaders/* $build/build/config/includes.binary cp -r $build/backgrounds/* $build/build/config/includes.chroot/usr/share/backgrounds cp -r $build/calamares/* $build/build/config/includes.chroot/etc/calamares cp -r $build/configs/* $build/build/config/includes.chroot/etc/ cp -r $build/icons/* $build/build/config/includes.chroot/usr/share/icons cp -r $build/themes/* $build/build/config/includes.chroot/usr/share/themes -cp -r $build/desktop-base/* $build/build/config/includes.chroot/usr/share/desktop-base -cp -r $build/plymouth/* $build/build/config/includes.chroot/usr/share/plymouth -cp -r $build/packages/* $build/build/config/packages.chroot +#cp -r $build/packages/* $build/build/config/packages.chroot cp -r $build/grub/themes/* $build/build/config/includes.chroot/boot/grub/themes diff --git a/buildtools/debootstrap_1.0.127+acoros2_all.deb b/buildtools/debootstrap_1.0.127+acoros2_all.deb deleted file mode 100644 index 38270344..00000000 Binary files a/buildtools/debootstrap_1.0.127+acoros2_all.deb and /dev/null differ diff --git a/buildtools/debootstrap_1.0.152acoros1_all.deb b/buildtools/debootstrap_1.0.152acoros1_all.deb new file mode 100644 index 00000000..deec99b0 Binary files /dev/null and b/buildtools/debootstrap_1.0.152acoros1_all.deb differ diff --git a/buildtools/live-build_20210407acoros1_all.deb b/buildtools/live-build_20210407acoros1_all.deb deleted file mode 100644 index 98105f10..00000000 Binary files a/buildtools/live-build_20210407acoros1_all.deb and /dev/null differ diff --git a/buildtools/live-build_20230502acoros1_all.deb b/buildtools/live-build_20230502acoros1_all.deb new file mode 100644 index 00000000..af83f211 Binary files /dev/null and b/buildtools/live-build_20230502acoros1_all.deb differ diff --git a/calamares/modules/fstab.conf b/calamares/modules/fstab.conf index 29907170..8da60df0 100644 --- a/calamares/modules/fstab.conf +++ b/calamares/modules/fstab.conf @@ -1,11 +1,27 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 +# +# Configure fstab options +# --- mountOptions: - default: defaults,noatime - btrfs: defaults,noatime,space_cache,autodefrag -ssdExtraMountOptions: - ext4: discard - jfs: discard - xfs: discard - swap: discard - btrfs: discard,compress=lzo + default: defaults,noatime,nodiscard + btrfs: defaults,noatime,noautodefrag,nodiscard + btrfs_swap: defaults + swap: defaults + crypttabOptions: luks,keyscript=/bin/cat + +efiMountOptions: umask=0077 + +ssdExtraMountOptions: + btrfs: ssd + +tmpOptions: + default: + tmpfs: false + options: "" + ssd: + tmpfs: true + options: "defaults,noatime,mode=1777" + diff --git a/calamares/modules/mount.conf b/calamares/modules/mount.conf index bb28eed6..b22676f1 100644 --- a/calamares/modules/mount.conf +++ b/calamares/modules/mount.conf @@ -1,18 +1,10 @@ -# Mount filesystems in the target (generally, before treating the -# target as a usable chroot / "live" system). Filesystems are -# automatically mounted from the partitioning module. Filesystems -# listed here are **extra**. The filesystems listed in *extraMounts* -# are mounted in all target systems. The filesystems listed in -# *extraMountsEfi* are mounted in the target system **only** if -# the host machine uses UEFI. ---- -# Extra filesystems to mount. The key's value is a list of entries; each -# entry has four keys: -# - device The device node to mount -# - fs The filesystem type to use -# - mountPoint Where to mount the filesystem -# - options (optional) Extra options to pass to mount(8) +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 # +# Mount filesystems in the target (generally, before treating the +# target as a usable chroot / "live" system). +--- + extraMounts: - device: proc fs: proc @@ -29,8 +21,18 @@ extraMounts: - device: /run/udev mountPoint: /run/udev options: bind - -extraMountsEfi: - device: efivarfs fs: efivarfs mountPoint: /sys/firmware/efi/efivars + +btrfsSwapSubvol: /@swap + +btrfsSubvolumes: + - mountPoint: / + subvolume: /@ + - mountPoint: /home + subvolume: /@home + - mountPoint: /var/cache + subvolume: /@cache + - mountPoint: /var/log + subvolume: /@log diff --git a/calamares/modules/openrcdmcryptcfg.conf b/calamares/modules/openrcdmcryptcfg.conf new file mode 100644 index 00000000..0dbd0782 --- /dev/null +++ b/calamares/modules/openrcdmcryptcfg.conf @@ -0,0 +1,7 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 +# +# Configuration file for opendmcryptcfg module +# +--- +configFilePath: /etc/conf.d/dmcrypt diff --git a/calamares/modules/partition.conf b/calamares/modules/partition.conf index a0423714..68d182d8 100644 --- a/calamares/modules/partition.conf +++ b/calamares/modules/partition.conf @@ -1,10 +1,15 @@ efiSystemPartition: "/boot/efi" +efiSystemPartitionSize: 800M +efiSystemPartitionName: EFI userSwapChoices: - none # Create no swap, use no swap - small # Up to 4GB - suspend # At least main memory size - file # To swap file instead of partition +swapPartitionName: SWAP +drawNestedPartitions: false alwaysShowPartitionLabels: true +allowManualPartitioning: true initialPartitioningChoice: erase initialSwapChoice: none defaultFileSystemType: "ext4" diff --git a/calamares/modules/services-systemd.conf b/calamares/modules/services-systemd.conf new file mode 100644 index 00000000..ed4608b2 --- /dev/null +++ b/calamares/modules/services-systemd.conf @@ -0,0 +1,13 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 +# +# Systemd services manipulation. +# +# This module can enable services, timers and targets for systemd +# (if packaging doesn't already do that). It can also +# disable services and targets as well as mask units. + +timers: + - name: "fstrim" + mandatory: false + diff --git a/calamares/modules/users.conf b/calamares/modules/users.conf index a0ba0821..37c0a687 100644 --- a/calamares/modules/users.conf +++ b/calamares/modules/users.conf @@ -14,5 +14,10 @@ defaultGroups: - bluetooth - sambashare autologinGroup: autologin +doAutologin: false sudoersGroup: sudo setRootPassword: true +doReusePassword: true +allowWeakPasswords: true +allowWeakPasswordsDefault: true +userShell: /bin/bash diff --git a/configs/skel/.config/Thunar/uca.xml b/configs/skel/.config/Thunar/uca.xml index 7a7405d3..e5fb8905 100644 --- a/configs/skel/.config/Thunar/uca.xml +++ b/configs/skel/.config/Thunar/uca.xml @@ -2,62 +2,58 @@ utilities-terminal - Abrir terminal aqui + Open terminal here + 1615372407408747-1 exo-open --working-directory %f --launch TerminalEmulator - Exemplo de uma ação personalizada + Example of a custom action + * org.xfce.thunar - Abrir como root + Open as root + 1616353956436746-1 - pkexec thunar - Abrir como root + pkexec thunar %f + Open as root + * preferences-system-search - Procurar por ficheiros + Search for files + 1616359736871731-4 catfish --path=%f - localizar arquivos e pastas + Find files and folders + * - edit-delete - Remover como root - 1616360545203289-6 - xterm -g 35x5 -fa 'Luxi Mono' -fs 14 -e sudo rm -rf %F - Remover arquivos e pastas + accessories-text-editor + Edit as root + + 1687651355823916-1 + pkexec mousepad %f + Edit as root + * * - - - - - - application-x-iso - Montar ficheiros de imagem - 1616360728478102-7 - fuseiso -n -p %f %f.mount ; thunar %f.mount - Montar ficheiros de imagem + application-vnd.oasis.opendocument.text-template + Open in Terminal + + 1687651793865147-4 + xfce4-terminal -x nano %f + Open in Terminal + * * - - - - application-x-iso - Desmontar Imagem - 1616361698703082-8 - fusermount -u -z %f - Desmontar Imagem - * - + diff --git a/configs/skel/.config/xfce4/desktop/icons.screen.latest.rc b/configs/skel/.config/xfce4/desktop/icons.screen.latest.rc deleted file mode 120000 index d9dddeca..00000000 --- a/configs/skel/.config/xfce4/desktop/icons.screen.latest.rc +++ /dev/null @@ -1 +0,0 @@ -/home/xubuntu/.config/xfce4/desktop/icons.screen0-1424x859.rc \ No newline at end of file diff --git a/configs/skel/.config/xfce4/desktop/icons.screen0-1008x727.rc b/configs/skel/.config/xfce4/desktop/icons.screen0-1008x727.rc deleted file mode 100644 index 7e2fa81e..00000000 --- a/configs/skel/.config/xfce4/desktop/icons.screen0-1008x727.rc +++ /dev/null @@ -1,15 +0,0 @@ -[xfdesktop-version-4.10.3+-rcfile_format] -4.10.3+=true - -[/home/user/Desktop/ubiquity.desktop] -row=0 -col=0 - -#[Lixo] -#row=0 -#col=0 - -#[/home/user] -#row=1 -#col=0 - diff --git a/configs/skel/.config/xfce4/desktop/icons.screen0-1424x859.rc b/configs/skel/.config/xfce4/desktop/icons.screen0-1424x859.rc deleted file mode 100644 index 7a902663..00000000 --- a/configs/skel/.config/xfce4/desktop/icons.screen0-1424x859.rc +++ /dev/null @@ -1,23 +0,0 @@ -[xfdesktop-version-4.10.3+-rcfile_format] -4.10.3+=true - -[/home/user/Desktop/xdg] -row=1 -col=0 - -[/home/user/Desktop/ubiquity.desktop] -row=0 -col=0 - -[/home/user/Desktop/xdg.tar.gz] -row=2 -col=0 - -#[Lixo] -#row=0 -#col=0 - -#[/home/user] -#row=1 -#col=0 - diff --git a/configs/skel/.config/xfce4/helpers.rc b/configs/skel/.config/xfce4/helpers.rc deleted file mode 100644 index 27b78b8a..00000000 --- a/configs/skel/.config/xfce4/helpers.rc +++ /dev/null @@ -1,4 +0,0 @@ -WebBrowser=firefox -MailReader=thunderbird -FileManager=thunar -TerminalEmulator=xfce4-terminal diff --git a/desktop-base/futureprototype-theme/grub/grub-16x9.png b/desktop-base/futureprototype-theme/grub/grub-16x9.png deleted file mode 100644 index c90d81de..00000000 Binary files a/desktop-base/futureprototype-theme/grub/grub-16x9.png and /dev/null differ diff --git a/desktop-base/futureprototype-theme/grub/grub-4x3.png b/desktop-base/futureprototype-theme/grub/grub-4x3.png deleted file mode 100644 index f342bd95..00000000 Binary files a/desktop-base/futureprototype-theme/grub/grub-4x3.png and /dev/null differ diff --git a/desktop-base/futureprototype-theme/grub/grub_background.sh b/desktop-base/futureprototype-theme/grub/grub_background.sh deleted file mode 100644 index c7ba469d..00000000 --- a/desktop-base/futureprototype-theme/grub/grub_background.sh +++ /dev/null @@ -1,3 +0,0 @@ -WALLPAPER=/usr/share/images/desktop-base/desktop-grub.png -COLOR_NORMAL=white/black -COLOR_HIGHLIGHT=black/white diff --git a/desktop-base/futureprototype-theme/plymouth b/desktop-base/futureprototype-theme/plymouth deleted file mode 120000 index c814a5d4..00000000 --- a/desktop-base/futureprototype-theme/plymouth +++ /dev/null @@ -1 +0,0 @@ -../../plymouth/themes/futureprototype \ No newline at end of file diff --git a/desktop-base/homeworld-theme/grub/grub-16x9.png b/desktop-base/homeworld-theme/grub/grub-16x9.png deleted file mode 100644 index c90d81de..00000000 Binary files a/desktop-base/homeworld-theme/grub/grub-16x9.png and /dev/null differ diff --git a/desktop-base/homeworld-theme/grub/grub-4x3.png b/desktop-base/homeworld-theme/grub/grub-4x3.png deleted file mode 100644 index f342bd95..00000000 Binary files a/desktop-base/homeworld-theme/grub/grub-4x3.png and /dev/null differ diff --git a/desktop-base/homeworld-theme/grub/grub_background.sh b/desktop-base/homeworld-theme/grub/grub_background.sh deleted file mode 100644 index c7ba469d..00000000 --- a/desktop-base/homeworld-theme/grub/grub_background.sh +++ /dev/null @@ -1,3 +0,0 @@ -WALLPAPER=/usr/share/images/desktop-base/desktop-grub.png -COLOR_NORMAL=white/black -COLOR_HIGHLIGHT=black/white diff --git a/desktop-base/homeworld-theme/plymouth b/desktop-base/homeworld-theme/plymouth deleted file mode 120000 index cc824273..00000000 --- a/desktop-base/homeworld-theme/plymouth +++ /dev/null @@ -1 +0,0 @@ -../../plymouth/themes/homeworld \ No newline at end of file diff --git a/hooks/normal/0520-applications.hook.chroot b/hooks/normal/0520-applications.hook.chroot index e4cad2ac..93d69271 100755 --- a/hooks/normal/0520-applications.hook.chroot +++ b/hooks/normal/0520-applications.hook.chroot @@ -1,14 +1,35 @@ #!/bin/bash -### Error checking added to "lint-trap" section. -### Missing files no longer cause builds to fail. +################################################################################ +# Title: 0520-applications.hook.chroot +# Description: Script to remove packages and other things +# Author: manuel rosa +# Date: Outubro 29, 2023 +# License: GPL-3.0-or-later +################################################################################ # Remove software -# apt remove -y firefox-esr -# apt remove -y termit -apt --purge --yes autoremove vim vim-tiny murrine-themes termit gnome-shell gdm3 ubuntu-session mutter gnome-control-center gnome-control-center-data gnome-control-center-faces gnome-online-accounts gedit* apport update-notifier-common update-notifier +apt --purge --yes autoremove \ +vim \ +vim-tiny \ +murrine-themes \ +termit \ +gnome-shell \ +gdm3 \ +ubuntu-session \ +mutter \ +gnome-control-center \ +gnome-control-center-data \ +gnome-control-center-faces \ +gnome-online-accounts \ +gedit* \ +apport \ +update-notifier-common \ +update-notifier + # Lowers the footprint in RAM at the small expense of added size to the ISO. -update-icon-caches /usr/share/icons/* +#update-icon-caches /usr/share/icons/* +find /usr/share/icons -type d -exec gtk-update-icon-cache -f {} \; #add flatpak repo to gnome-software flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo diff --git a/hooks/normal/0550-install-browsers.hook.chroot b/hooks/normal/0550-install-browsers.hook.chroot index 4465de30..c460c8d6 100755 --- a/hooks/normal/0550-install-browsers.hook.chroot +++ b/hooks/normal/0550-install-browsers.hook.chroot @@ -8,16 +8,14 @@ apt install -y apt-transport-https curl #Add the repository keyrings #Brave browser curl -fsSLo /usr/share/keyrings/brave-browser-archive-keyring.gpg https://brave-browser-apt-release.s3.brave.com/brave-browser-archive-keyring.gpg -#Vivaldy browser -#wget -qO- https://repo.vivaldi.com/archive/linux_signing_key.pub | gpg --dearmor | sudo dd of=/usr/share/keyrings/vivaldi-browser.gpg + #Add repositorys to sources.list #Brave browser echo "deb [signed-by=/usr/share/keyrings/brave-browser-archive-keyring.gpg arch=amd64] https://brave-browser-apt-release.s3.brave.com/ stable main"|sudo tee /etc/apt/sources.list.d/brave-browser-release.list -#Vivaldy browser -#echo "deb [signed-by=/usr/share/keyrings/vivaldi-browser.gpg arch=$(dpkg --print-architecture)] https://repo.vivaldi.com/archive/deb/ stable main" | sudo dd of=/etc/apt/sources.list.d/vivaldi-archive.list -#Update the repos -apt update + +#Update the repos and the system +apt update && apt -y upgrade #install the package -#apt -y install brave-browser vivaldi-stable -apt -y install brave-browser +apt install -y brave-browser + diff --git a/packages/desktop-base_45.0.4_all.deb b/packages/desktop-base_45.0.4_all.deb deleted file mode 100644 index ffb05984..00000000 Binary files a/packages/desktop-base_45.0.4_all.deb and /dev/null differ diff --git a/plymouth/themes/debian-theme b/plymouth/themes/debian-theme deleted file mode 120000 index 132ecfa1..00000000 --- a/plymouth/themes/debian-theme +++ /dev/null @@ -1 +0,0 @@ -../../desktop-base/active-theme/plymouth \ No newline at end of file diff --git a/plymouth/themes/futureprototype/debian (cópia 1).png b/plymouth/themes/futureprototype/debian (cópia 1).png deleted file mode 100644 index 434a0925..00000000 Binary files a/plymouth/themes/futureprototype/debian (cópia 1).png and /dev/null differ diff --git a/plymouth/themes/futureprototype/debian.png b/plymouth/themes/futureprototype/debian.png deleted file mode 100644 index 434a0925..00000000 Binary files a/plymouth/themes/futureprototype/debian.png and /dev/null differ diff --git a/plymouth/themes/futureprototype/futureprototype.plymouth b/plymouth/themes/futureprototype/futureprototype.plymouth deleted file mode 100644 index 905ad20e..00000000 --- a/plymouth/themes/futureprototype/futureprototype.plymouth +++ /dev/null @@ -1,8 +0,0 @@ -[Plymouth Theme] -Name=Default theme for Debian 10.0 Buster -Description=A theme that features a white debian 10 logo in a white spinning circle -ModuleName=script - -[script] -ImageDir=/usr/share/plymouth/themes/futureprototype -ScriptFile=/usr/share/plymouth/themes/futureprototype/futureprototype.script diff --git a/plymouth/themes/futureprototype/futureprototype.script b/plymouth/themes/futureprototype/futureprototype.script deleted file mode 100644 index 08f8032d..00000000 --- a/plymouth/themes/futureprototype/futureprototype.script +++ /dev/null @@ -1,1064 +0,0 @@ -# futureprototype.script - boot splash using script plugin -# -# Copyright (C) 2009 Canonical Ltd. -# Copyright © 2010-2016 Aurélien Couderc -# Copyright © 2014-2016 Juliette Taka -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. -# -# Written by: Alberto Milone -# -# Based on the example provided with the "script plugin" written by: -# Charlie Brej -# - - -#------------------------------- Constants ----------------------------------------- -NB_ROTATION_STEPS = 70; -NB_REFRESHS_BETWEEN_ANIMS = 3; - -# Initial position of the center of the logo in % of background -DEBIAN_POS_PCT.y = 0.65; # Debian image position in % of screen height -DEBIAN_HEIGHT_PCT = 0.07; # Debian image height in % of smallest screen dimension -LOGO_CENTER_PCT.x = 0.5; # Debian swirl image position in % of screen height & width -LOGO_CENTER_PCT.y = 0.442; -LOGO_SIZE_PCT = 0.18; # Debian swirl image size in % of smallest screen dimension - -#------------------------------- Globals ------------------------------------------- -# are we currently prompting for a password? -prompt_active = 0; - -# Globals to share progress time / percent with intersted functions -progress_time = 0; -progress_pct = 0; - -# Variables for glow rotation animation -anim_start_time = NULL; -anim_status = "stopped"; -refresh_iter = 0; -anim_iter = 0; - -#-----------------------------Text-image functions---------------------------- - -# Set the text colour in (rgb / 256) -text_colour.red = 1.0; -text_colour.green = 1.0; -text_colour.blue = 1.0; - -# Tinted text #988592 -tinted_text_colour.red = 1.0; -tinted_text_colour.green = 1.0; -tinted_text_colour.blue = 1.0; - -# Action Text - #ffffff - RGB 255 255 255 -action_text_colour.red = 1.0; -action_text_colour.green = 1.0; -action_text_colour.blue = 1.0; - -# Orange - #ff4012 - RGB 255 64 18 -debugsprite = Sprite(); -debugsprite_bottom = Sprite(); -debugsprite_bottom.SetPosition(0, (Window.GetHeight (0) - 20), 1); -debugsprite_medium = Sprite(); -debugsprite_medium.SetPosition(0, (Window.GetHeight (0) - 100), 1); - -# General purpose function to create text -fun WriteText (text, colour) { - image = Image.Text (text, colour.red, colour.green, colour.blue); - return image; -} - -fun ImageFromText (text) { - image = WriteText (text, text_colour); - return image; -} - -fun ImageFromTintedText (text) { - image = WriteText (text, tinted_text_colour); - return image; -} - -fun ImageFromActionText (text) { - image = WriteText (text, action_text_colour); - return image; -} - -fun Debug(text) { - debugsprite.SetImage(ImageFromText (text)); -} - -fun DebugBottom(text) { - debugsprite_bottom.SetImage(ImageFromText (text)); -} - -fun DebugMedium(text) { - debugsprite_medium.SetImage(ImageFromText (text)); -} - -#Debug("Window.GetHeight(0) = " + Window.GetHeight(0)); -fun TextYOffset() { - local.y; - local.text_height; - local.min_height; - - # Put the 1st line below the logo + some spacing - y = debian_sprite.GetY() + debian.GetHeight(); - #Debug("y = " + y); - - text_height = first_line_height * 7.5; - min_height = window_max.height; - #Debug("text_height=" + text_height + "; min_height=" + min_height); - - if (y + text_height > min_height) - y = min_height - text_height; - - return y; -} - - -#----------------------------- Screen/window setup --------------------------- -# Compute screen/image ratio and scale the background accordingly -window_max.width = Window.GetX() * 2 + Window.GetWidth(); -window_max.height = Window.GetY() * 2 + Window.GetHeight(); -screen_ratio = window_max.width / window_max.height; -small_dimension = Math.Min(window_max.width, window_max.height); -#Debug("Window.GetX():" + Window.GetX() + ", Window.GetY():" + Window.GetY()); -#Debug("Window is [" + window_max.width + ";" + window_max.height + "], ratio=" + screen_ratio); - -debian_height = small_dimension * DEBIAN_HEIGHT_PCT; -debian_pos.y = window_max.height * DEBIAN_POS_PCT.y - debian_height/2; -logo_size = small_dimension * LOGO_SIZE_PCT; -logo_center.x = window_max.width * LOGO_CENTER_PCT.x; -logo_center.y = window_max.height * LOGO_CENTER_PCT.y; -#Debug("Logo center at [" + logo_center.x + ";" + logo_center.y + "], size=" + logo_size + "px"); - -logo_pos.x = logo_center.x - logo_size/2; -logo_pos.y = logo_center.y - logo_size/2; - -#------------------------------- Background ---------------------------------------- -bg_image = Image("plymouth_background_future.png"); -bg_image_ratio = bg_image.GetWidth() / bg_image.GetHeight(); -if (screen_ratio > bg_image_ratio) - bg_scale_factor = window_max.width / bg_image.GetWidth(); -else - bg_scale_factor = window_max.height / bg_image.GetHeight(); -scaled_bg_image = bg_image.Scale(bg_image.GetWidth() * bg_scale_factor, - bg_image.GetHeight() * bg_scale_factor); - -# Display background -bg_sprite = Sprite(scaled_bg_image); -bg_sprite.SetPosition(Window.GetX() + Window.GetWidth() / 2 - scaled_bg_image.GetWidth() / 2, - Window.GetY() + Window.GetHeight() / 2 - scaled_bg_image.GetHeight() / 2, - -1000); - -#------------------------------- Debian ---------------------------------------------- -debian = Image("debian.png"); -# Target same height as logo -debian_scale_factor = debian_height / debian.GetHeight(); -debian = debian.Scale(debian.GetWidth() * debian_scale_factor, - debian.GetHeight() * debian_scale_factor); -debian_sprite = Sprite(debian); -debian_sprite.SetPosition(window_max.width / 2 - debian.GetWidth() / 2, - debian_pos.y, - -90); - -#------------------------------- Logo ---------------------------------------------- -logo = Image("logo.png"); -logo_scale_factor = logo_size / logo.GetWidth(); -logo = logo.Scale(logo.GetWidth() * logo_scale_factor, - logo.GetHeight() * logo_scale_factor); -logo_to_top_edge = Window.GetHeight() * 0.3; -logo_sprite = Sprite(logo); -logo_sprite.SetPosition(logo_pos.x, logo_pos.y, -50); - - -logo_glow = Image("logo_circle.png"); -logo_glow_scale_factor = logo_size / logo_glow.GetWidth(); -logo_glow[0] = logo_glow.Scale(logo_glow.GetWidth() * logo_glow_scale_factor, - logo_glow.GetHeight() * logo_glow_scale_factor); -logo_glow_sprite = Sprite(); -logo_glow_sprite.SetPosition(logo_pos.x, logo_pos.y, -60); -logo_glow_sprite.SetImage(logo_glow[0]); - - - -#------------------------------String functions------------------------------- - -# This is the equivalent for strstr() -fun StringString(string, substring) { - start = 0; - while (String(string).CharAt (start)) { - walk = 0; - while (String(substring).CharAt (walk) == String(string).CharAt (start + walk) ) { - walk++; - if (!String(substring).CharAt (walk)) return start; - } - start++; - } - - return NULL; -} - -fun StringLength (string) { - index = 0; - while (String(string).CharAt(index)) index++; - return index; -} - -fun StringCopy (source, beginning, end) { - local.destination = ""; - for (index = beginning; ( ( (end == NULL) || (index <= end) ) && (String(source).CharAt(index)) ); index++) { - local.destination += String(source).CharAt(index); - } - - return local.destination; -} - -fun StringReplace (source, pattern, replacement) { - local.found = StringString(source, pattern); - if (local.found == NULL) - return source; - - local.new_string = StringCopy (source, 0, local.found - 1) + - replacement + - StringCopy (source, local.found + StringLength(pattern), NULL); - - return local.new_string; -} - -# it makes sense to use it only for -# numbers up to 100 -fun StringToInteger (str) { - int = -1; - for (i=0; i<=100; i++) { - if (i+"" == str) { - int = i; - break; - } - } - return int; -} - -#----------------------------------------------------------------------------- -# Top background colour -# #489291 --> 0.282, 0.572, 0.569 -# New background colour -# #0a3649 --> 0.039, 0.212, 0.286 -# -Window.SetBackgroundTopColor (0.282, 0.572, 0.569); # Nice colour on top of the screen fading to -Window.SetBackgroundBottomColor (0.039, 0.212, 0.286); # an equally nice colour on the bottom - -bits_per_pixel = Window.GetBitsPerPixel (); -# TODO need to handle 16 colors ? -#if (bits_per_pixel == 4) { -# logo_filename = "debian_logo16.png"; -# progress_dot_off_filename = "progress_dot_off16.png"; -# progress_dot_on_filename = "progress_dot_on16.png"; -# password_dot_filename = "password_dot.png"; -# password_field_filename = "password_field16.png"; -#} else { -# logo_filename = "debian_logo.png"; -# progress_dot_off_filename = "progress_dot_off.png"; -# progress_dot_on_filename = "progress_dot_on.png"; - password_dot_filename = "password_dot.png"; - password_field_filename = "password_field.png"; -#} - -message_notification[0].image = ImageFromTintedText (""); -message_notification[1].image = ImageFromTintedText (""); -fsck_notification.image = ImageFromActionText (""); - -status = "normal"; - -# use a fixed string with ascending and descending stems to calibrate the -# bounding box for the first message, so the messages below don't move up -# and down according to *their* height. -first_line_height = ImageFromTintedText ("AfpqtM").GetHeight(); - -# if the user has a 640x480 or 800x600 display, we can't quite fit everything -# (including passphrase prompts) with the target spacing, so scoot the text up -# a bit if needed. -top_of_the_text = TextYOffset(); - - -#-------------------------------Progress Indicator----------------------------- -# Implement in boot progress callback -fun animate_progress_indicator (time, progress) { - progress_time = time; - progress_pct = progress; - - #Debug ("mode = " + Plymouth.GetMode() + ", progress_time = " + progress_time + ", progress_pct = " + progress_pct); - -} - - -#-----------------------------------------Label utility functions--------------------- - -# label should be either a string or NULL -# Images for n lines will be created and returned as items of the -# message_label array -# -fun get_message_label (label, is_fake, is_action_line) { - #Debug("Get Label position"); - local.message_label; - - if (is_fake) - # Create a fake label so as to get the y coordinate of - # a standard-length label. - local.message_image = ImageFromTintedText ("This is a fake message"); - else - local.message_image = (is_action_line) && ImageFromActionText (label) || ImageFromTintedText (label); - - message_label.width = message_image.GetWidth (); - message_label.height = message_image.GetHeight (); - - # Center the line horizontally - message_label.x = Window.GetX () + Window.GetWidth () / 2 - message_label.width / 2; - - message_label.y = top_of_the_text; - - # Put the 2nd line below the fsck line - if (is_action_line) { - local.fsck_label.y = message_label.y + (first_line_height + first_line_height / 2); - message_label.y = local.fsck_label.y + (first_line_height * 1.5); - } - - #Debug("action label x = " + message_label.x + " y = " + message_label.y ); - -# message_debug = "msg_x = " + message_label.x + " msg_y = " + message_label.y + -# "msg_width = " + message_label.width + " msg_height = " + -# message_label.height + " message = " + label; -# Debug(message_debug); - - return message_label; - -} - -# Create an fsck label and/or get its position -fun get_fsck_label (label, is_fake) { - # Debug("Get Label position"); - local.fsck_label = global.progress_label; - - if (is_fake) - fsck_label.image = ImageFromTintedText ("This is a fake message"); - else - fsck_label.image = ImageFromTintedText (label); - - fsck_label.width = fsck_label.image.GetWidth (); - fsck_label.height = fsck_label.image.GetHeight (); - - # Centre the label horizontally - fsck_label.x = Window.GetX () + Window.GetWidth () / 2 - fsck_label.width / 2; - - local.first_label = get_message_label (label, 1, 0); - - # Place the label below the 1st message line - fsck_label.y = local.first_label.y + local.first_label.height + (local.first_label.height / 2); - -# message_debug = "msg_x = " + fsck_label.x + " msg_y = " + fsck_label.y + -# "msg_width = " + fsck_label.width + " msg_height = " + -# fsck_label.height + " message = " + label; -# Debug(message_debug); - - return fsck_label; -} - -#-----------------------------------------Message stuff -------------------------------- -# - -# Set up a message label -# -# NOTE: this is called when doing something like 'plymouth message "hello world"' -# -fun setup_message (message_text, x, y, z, index) { - #DebugMedium("Message setup: " + message_text); - global.message_notification[index].image = (index) && ImageFromActionText (message_text) || ImageFromTintedText (message_text); - - # Set up the text message, if any - message_notification[index].x = x; - message_notification[index].y = y; - message_notification[index].z = z; - - message_notification[index].sprite = Sprite (); - message_notification[index].sprite.SetImage (message_notification[index].image); - message_notification[index].sprite.SetX (message_notification[index].x); - message_notification[index].sprite.SetY (message_notification[index].y); - message_notification[index].sprite.SetZ (message_notification[index].z); - -} - -fun show_message (index) { - if (global.message_notification[index].sprite) global.message_notification[index].sprite.SetOpacity(1); -} - -fun hide_message (index) { - if (global.message_notification[index].sprite) global.message_notification[index].sprite.SetOpacity(0); -} - - - - -# the callback function is called when new message should be displayed. -# First arg is message to display. -fun message_callback (message) -{ - # Debug("Message callback"); - is_fake = 0; - if (!message || (message == "")) is_fake = 1; - - local.substring = "keys:"; - - # Look for the "keys:" prefix - local.keys = StringString(message, local.substring); - - local.is_action_line = (keys != NULL); - #Debug("keys " + local.keys + " substring length = " + StringLength(local.substring)); - - # Get the message without the "keys:" prefix - if (keys != NULL) - message = StringCopy (message, keys + StringLength(local.substring), NULL); - - # Get the message without the "fsckd-cancel-msg" prefix as we don't support i18n - substring = "fsckd-cancel-msg:"; - keys = StringString(message, substring); - if (keys != NULL) - message = StringCopy(message, keys + StringLength(substring), NULL); - - local.label.is_fake = is_fake; - label = get_message_label(message, is_fake, is_action_line); - label.z = 10000; - - setup_message (message, label.x, label.y, label.z, is_action_line); - if (prompt_active && local.is_action_line) - hide_message (is_action_line); - else - show_message (is_action_line); - -} - - -#-----------------------------------------Display Password stuff ----------------------- -# - -fun password_dialogue_setup (message_label) { - #Debug("Password dialog setup"); - - local.entry; - local.bullet_image; - - bullet_image = Image (password_dot_filename); - entry.image = Image (password_field_filename); - - # Hide the normal labels - prompt_active = 1; - if (message_notification[1].sprite) hide_message (1); - - # Set the prompt label - label = get_message_label(message_label, 0, 1); - label.z = 10000; - - setup_message (message_label, label.x, label.y, label.z, 2); - show_message (2); - - # Set up the text entry which contains the bullets - entry.sprite = Sprite (); - entry.sprite.SetImage (entry.image); - - # Centre the box horizontally - entry.x = Window.GetX () + Window.GetWidth () / 2 - entry.image.GetWidth () / 2; - - # Put the entry below the second label. - entry.y = message_notification[2].y + label.height * 1.5; - - #DebugMedium("entry x = " + entry.x + ", y = " + entry.y); - entry.z = 10000; - entry.sprite.SetX (entry.x); - entry.sprite.SetY (entry.y); - entry.sprite.SetZ (entry.z); - - global.password_dialogue = local; -} - -fun password_dialogue_opacity (opacity) { - #Debug("Setting password dialog opacity to " + opacity); - global.password_dialogue.opacity = opacity; - local = global.password_dialogue; - - # You can make the box translucent with a float - # entry.sprite.SetOpacity (0.3); - entry.sprite.SetOpacity (opacity); - label.sprite.SetOpacity (opacity); - - if (bullets) { - for (index = 0; bullets[index]; index++) { - bullets[index].sprite.SetOpacity (opacity); - } - } -} - - -# The callback function is called when the display should display a password dialogue. -# First arg is prompt string, the second is the number of bullets. -fun display_password_callback (prompt, bullets) { - #Debug("Password dialog setup"); - - global.status = "password"; - if (!global.password_dialogue) password_dialogue_setup(prompt); - password_dialogue_opacity (1); - bullet_width = password_dialogue.bullet_image.GetWidth(); - bullet_y = password_dialogue.entry.y + - password_dialogue.entry.image.GetHeight () / 2 - - password_dialogue.bullet_image.GetHeight () / 2; - margin = bullet_width; - spaces = Math.Int( (password_dialogue.entry.image.GetWidth () - (margin * 2)) / (bullet_width / 2 ) ); - #DebugMedium ("spaces = " + spaces + ", bullets = " + bullets); - bullets_area.width = margin + spaces * (bullet_width / 2); - bullets_area.x = Window.GetX () + Window.GetWidth () / 2 - bullets_area.width / 2; - #DebugBottom ("pwd_entry (x,y) = " + password_dialogue.entry.x + "," + password_dialogue.entry.y - # + "), bullets_area.x = " + bullets_area.x + ", bullets_area.width = " + bullets_area.width); - if (bullets > spaces) - bullets = spaces; - for (index = 0; password_dialogue.bullets[index] || index < bullets; index++){ - if (!password_dialogue.bullets[index]) { - password_dialogue.bullets[index].sprite = Sprite (); - password_dialogue.bullets[index].sprite.SetImage (password_dialogue.bullet_image); - password_dialogue.bullets[index].x = bullets_area.x + # password_dialogue.entry.x + margin + - index * bullet_width / 2; - password_dialogue.bullets[index].sprite.SetX (password_dialogue.bullets[index].x); - password_dialogue.bullets[index].y = bullet_y; - password_dialogue.bullets[index].sprite.SetY (password_dialogue.bullets[index].y); - password_dialogue.bullets[index].z = password_dialogue.entry.z + 1; - password_dialogue.bullets[index].sprite.SetZ (password_dialogue.bullets[index].z); - } - - password_dialogue.bullets[index].sprite.SetOpacity (0); - - if (index < bullets) { - password_dialogue.bullets[index].sprite.SetOpacity (1); - } - } -} - -Plymouth.SetDisplayPasswordFunction (display_password_callback); - -Plymouth.SetMessageFunction (message_callback); - -Plymouth.SetBootProgressFunction (animate_progress_indicator); - -# Plymouth.SetBootProgressFunction: the callback function is called with two numbers, the progress (between 0 and 1) and the time spent booting so far -# Plymouth.SetRootMountedFunction: the callback function is called when a new root is mounted -# Plymouth.SetKeyboardInputFunction: the callback function is called with a string containing a new character entered on the keyboard - -#----------------------------------------- FSCK Counter -------------------------------- - -# Initialise the counter -fun init_fsck_count () { - # The number of fsck checks in this cycle - global.counter.total = 0; - # The number of fsck checks already performed + the current one - global.counter.current = 1; - # The previous fsck - global.counter.last = 0; -} - -# Increase the total counter -fun increase_fsck_count () { - global.counter.total++; -} - -fun increase_current_fsck_count () { - global.counter.last = global.counter.current++; -} - -# Clear the counter -fun clear_fsck_count () { - global.counter = NULL; - init_fsck_count (); -} - -#----------------------------------------- Progress Label ------------------------------ - - -# Change the opacity level of a progress label -# -# opacity = 1 -> show -# opacity = 0 -> hide -# opacity = 0.3 (or any other float) -> translucent -# -fun set_progress_label_opacity (opacity) { - # the label - progress_label.sprite.SetOpacity (opacity); - - # Make the slot available again when hiding the bar - # So that another bar can take its place - if (opacity == 0) { - progress_label.is_available = 1; - progress_label.device = ""; - } -} - -# Set up a new Progress Bar -# -# TODO: Make it possible to reuse (rather than recreate) a bar -# if .is_available = 1. Ideally this would just reset the -# label, the associated -# device and the image size of the sprite. - -fun init_progress_label (device, status_string) { - # Make the slot unavailable - global.progress_label.is_available = 0; - progress_label.progress = 0; - progress_label.device = device; - progress_label.status_string = status_string; -} - -# See if the progress label is keeping track of the fsck -# of "device" -# -fun device_has_progress_label (device) { - #DebugBottom ("label device = " + progress_label.device + " checking device " + device); - return (progress_label.device == device); -} - -# Update the Progress bar which corresponds to index -# -fun update_progress_label (progress) { - # If progress is NULL then we just refresh the label. - # This happens when only counter.total has changed. - if (progress != NULL) { - progress_label.progress = progress; - - #Debug("device " + progress_label.device + " progress " + progress); - - # If progress >= 100% hide the label and make it available again - if (progress >= 100) { - set_progress_label_opacity (0); - - # See if we any other fsck check is complete - # and, if so, hide the progress bars and the labels - on_fsck_completed (); - - return 0; - } - } - # Update progress label here - # - # FIXME: the queue logic from this theme should really be moved into mountall - # instead of using string replacement to deal with localised strings. - label = StringReplace (progress_label.status_string[0], "%1$d", global.counter.current); - label = StringReplace (label, "%2$d", global.counter.total); - label = StringReplace (label, "%3$d", progress_label.progress); - label = StringReplace (label, "%%", "%"); - - progress_label = get_fsck_label (label, 0); - #progress_label.progress = progress; - - progress_label.sprite = Sprite (progress_label.image); - - # Set up the bar - progress_label.sprite.SetPosition(progress_label.x, progress_label.y, 1); - - set_progress_label_opacity (1); - -} - -# Refresh the label so as to update counters -fun refresh_progress_label () { - update_progress_label (NULL); -} - -#----------------------------------------- FSCK Queue ---------------------------------- - -# Initialise the fsck queue -fun init_queue () { - global.fsck_queue[0].device; - global.fsck_queue[0].progress; - global.fsck_queue.counter = 0; - global.fsck_queue.biggest_item = 0; -} - -fun clear_queue () { - global.fsck_queue = NULL; - init_queue (); -} - -# Return either the device index in the queue or -1 -fun queue_look_up_by_device (device) { - for (i=0; i <= fsck_queue.biggest_item; i++) { - if ((fsck_queue[i]) && (fsck_queue[i].device == device)) - return i; - } - return -1; -} - -# Keep track of an fsck process in the queue -fun add_fsck_to_queue (device, progress) { - # Look for an empty slot in the queue - for (i=0; global.fsck_queue[i].device; i++) { - continue; - } - local.index = i; - - # Set device and progress - global.fsck_queue[local.index].device = device; - global.fsck_queue[local.index].progress = progress; - - # Increase the queue counter - global.fsck_queue.counter++; - - # Update the max index of the array for iterations - if (local.index > global.fsck_queue.biggest_item) - global.fsck_queue.biggest_item = local.index; - - #DebugMedium ("Adding " + device + " at " + local.index); -} - -fun is_queue_empty () { - return (fsck_queue.counter == 0); -} - -fun is_progress_label_available () { - return (progress_label.is_available == 1); -} - - -# This should cover the case in which the fsck checks in -# the queue are completed before the ones showed in the -# progress label -fun on_queued_fsck_completed () { - if (!is_queue_empty ()) - return; - - # Hide the extra label, if any - #if (progress_bar.extra_label.sprite) - # progress_bar.extra_label.sprite.SetOpacity(0); -} - -fun remove_fsck_from_queue (index) { - # Free memory which was previously allocated for - # device and progress - global.fsck_queue[index].device = NULL; - global.fsck_queue[index].progress = NULL; - - # Decrease the queue counter - global.fsck_queue.counter--; - - # See if there are other processes in the queue - # if not, clear the extra_label - on_queued_fsck_completed (); -} - -fun on_fsck_completed () { - # We have moved on to tracking the next fsck - increase_current_fsck_count (); - - if (!is_progress_label_available ()) - return; - - if (!is_queue_empty ()) - return; - - # Hide the progress label - if (progress_label.sprite) - progress_label.sprite.SetOpacity (0); - - # Clear the queue - clear_queue (); - - # Clear the fsck counter - clear_fsck_count (); -} - -# Update an fsck process that we keep track of in the queue -fun update_progress_in_queue (index, device, progress) { - # If the fsck is complete, remove it from the queue - if (progress >= 100) { - remove_fsck_from_queue (index); - on_queued_fsck_completed (); - return; - } - - global.fsck_queue[index].device = device; - global.fsck_queue[index].progress = progress; - -} - -# TODO: Move it to some function -# Create an empty queue -#init_queue (); - - -#----------------------------------------- FSCK Functions ------------------------------ - - -# Either add a new bar for fsck checks or update an existing bar -# -# NOTE: no more than "progress_bar.max_number" bars are allowed -# -fun fsck_check (device, progress, status_string) { - - # The 1st time this will take place - if (!global.progress_label) { - # Increase the fsck counter - increase_fsck_count (); - - # Set up a new label for the check - init_progress_label (device, status_string); - update_progress_label (progress); - - return; - } - - - if (device_has_progress_label (device)) { - # Update the progress of the existing label - update_progress_label (progress); - } - else { - # See if there's already a slot in the queue for the device - local.queue_device_index = queue_look_up_by_device(device); - - # See if the progress_label is available - if (progress_label.is_available) { - -# local.my_string = "available index " + local.available_index + " progress_bar counter is " + progress_bar.counter; -# Debug(local.my_string); - - - # If the fsck check for the device was in the queue, then - # remove it from the queue - if (local.queue_device_index >= 0) { - remove_fsck_from_queue (index); - } - else { - # Increase the fsck counter - increase_fsck_count (); - } - -# local.my_string += local.message; - #Debug("setting new label for device " + device + " progress " + progress); - - # Set up a new label for the check - init_progress_label (device, status_string); - update_progress_label (progress); - - } - # If the progress_label is not available - else { - - # If the fsck check for the device is already in the queue - # just update its progress in the queue - if (local.queue_device_index >= 0) { - #DebugMedium("Updating queue at " + local.queue_device_index + " for device " + device); - update_progress_in_queue (local.queue_device_index, device, progress); - } - # Otherwise add the check to the queue - else { - #DebugMedium("Adding device " + device + " to queue at " + local.queue_device_index); - add_fsck_to_queue (device, progress); - - # Increase the fsck counter - increase_fsck_count (); - - refresh_progress_label (); - } - - } - } - -# if (!is_queue_empty ()) { -# DebugBottom("Extra label for "+ device); - #} -# else { -# DebugBottom("No extra label for " + device + ". 1st Device in the queue "+ fsck_queue[0].device + " counter = " + global.fsck_queue.counter); -# } -} - - -#-----------------------------------------Update Status stuff -------------------------- -# -# The update_status_callback is what we can use to pass plymouth whatever we want so -# as to make use of features which are available only in this program (as opposed to -# being available for any theme for the script plugin). -# -# Example: -# -# Thanks to the current implementation, some scripts can call "plymouth --update=fsck:sda1:40" -# and this program will know that 1) we're performing and fsck check, 2) we're checking sda1, -# 3) the program should set the label progress to 40% -# -# Other features can be easily added by parsing the string that we pass plymouth with "--update" -# -fun update_status_callback (status) { -# Debug(status); - if (!status) return; - - string_it = 0; - update_strings[string_it] = ""; - - for (i=0; (String(status).CharAt(i) != ""); i++) { - local.temp_char = String(status).CharAt(i); - if (temp_char != ":") - update_strings[string_it] += temp_char; - else - update_strings[++string_it] = ""; - } - -# my_string = update_strings[0] + " " + update_strings[1] + " " + update_strings[2]; -# Debug(my_string); - # Let's assume that we're dealing with these strings fsck:sda1:40 - if ((string_it >= 2) && (update_strings[0] == "fsck")) { - - device = update_strings[1]; - progress = update_strings[2]; - status_string[0] = update_strings[3]; # "Checking disk %1$d of %2$d (%3$d %% complete)" - if (!status_string[0]) - status_string[0] = "Checking disk %1$d of %2$d (%3$d %% complete)"; - - if ((device != "") && (progress != "")) { - progress = StringToInteger (progress); - - # Make sure that the fsck_queue is initialised - if (!global.fsck_queue) - init_queue (); - - # Make sure that the fsck counter is initialised - if (!global.counter) - init_fsck_count (); - -# if (!global.progress_bar.extra_label.sprite) -# create_extra_fsck_label (); - - # Keep track of the fsck check - fsck_check (device, progress, status_string); - } - - } - - # systemd-fsckd pass fsckd::: - if (update_strings[0] == "fsckd") { - number_devices = StringToInteger(update_strings[1]); - - if (number_devices > 0) { - label = update_strings[3]; - - progress_label = get_fsck_label (label, 0); - progress_label.sprite = Sprite (progress_label.image); - progress_label.sprite.SetPosition(progress_label.x, progress_label.y, 1); - progress_label.sprite.SetOpacity (1); - } else { - if (progress_label.sprite) - progress_label.sprite.SetOpacity (0); - } - } - -} -Plymouth.SetUpdateStatusFunction (update_status_callback); - -#-----------------------------------------Display Question stuff ----------------------- -# -# TODO: Implement this if needed -# -# The callback function is called when the display should display a question dialogue. -# First arg is prompt string, the second is the entry contents. -#fun display_question_callback (prompt_string, entry_contents) -#{ -# time++; -#} -# -#Plymouth.SetDisplayQuestionFunction (display_question_callback); - -fun rotate_img(source_img, current_step, nb_steps) { - angle = Math.Sin(current_step / nb_steps * Math.Pi / 2) * 2 * Math.Pi; - #debug_sin = Math.Sin(current_step / nb_steps * Math.Pi / 2); - #DebugMedium("Sin = " + debug_sin); - rotated_img = source_img.Rotate(angle); - return rotated_img; -} - -fun update_glow_anim () { - if (global.anim_start_time != global.progress_time && global.anim_status != "running") { - global.anim_start_time = global.progress_time; - global.anim_iter = 0; - global.anim_status = "running"; - } - - if (global.anim_status == "running") { - iter_img = global.logo_glow[global.anim_iter]; - if (iter_img == NULL) { - # Generate rotated image for the glow around the logo on demand. - #DebugMedium("Generating rotated image for index " + global.anim_iter); - iter_img = rotate_img(logo_glow[0], global.anim_iter, NB_ROTATION_STEPS); - global.logo_glow[global.anim_iter] = iter_img; - } - global.logo_glow_sprite.SetImage(iter_img); - global.anim_iter++; - - if (global.anim_iter >= NB_ROTATION_STEPS) { - global.anim_status = "stopped"; - } - } -} - -#-----------------------------------------Refresh stuff -------------------------------- -# -# Calling Plymouth.SetRefreshFunction with a function will set that function to be -# called up to 50 times every second, e.g. -# -# NOTE: if a refresh function is not set, Plymouth doesn't seem to be able to update -# the screen correctly -# -fun refresh_callback () -{ - global.refresh_iter++; - if (global.refresh_iter == NB_REFRESHS_BETWEEN_ANIMS) { - global.refresh_iter = 0; - update_glow_anim(); - } - #DebugBottom ("refresh_iter=" + refresh_iter + "; anim_status=" + anim_status + "; anim_start_time=" + anim_start_time + "; anim_iter=" + anim_iter); -} -Plymouth.SetRefreshFunction (refresh_callback); - - -#-----------------------------------------Display Normal stuff ----------------------- -# -# The callback function is called when the display should return to normal -fun display_normal_callback () -{ - global.status = "normal"; - if (global.password_dialogue) { - password_dialogue_opacity (0); - global.password_dialogue = NULL; - if (message_notification[2].sprite) hide_message(2); - prompt_active = 0; - } - - if (message_notification[1].sprite) { - show_message (1); - } - -} - -Plymouth.SetDisplayNormalFunction (display_normal_callback); - - -#----------------------------------------- Quit -------------------------------- - -fun quit_callback () -{ -} - -Plymouth.SetQuitFunction(quit_callback); diff --git a/plymouth/themes/futureprototype/logo.png b/plymouth/themes/futureprototype/logo.png deleted file mode 100644 index f228662d..00000000 Binary files a/plymouth/themes/futureprototype/logo.png and /dev/null differ diff --git a/plymouth/themes/futureprototype/logo_circle.png b/plymouth/themes/futureprototype/logo_circle.png deleted file mode 100644 index ed3bf4be..00000000 Binary files a/plymouth/themes/futureprototype/logo_circle.png and /dev/null differ diff --git a/plymouth/themes/futureprototype/password_dot.png b/plymouth/themes/futureprototype/password_dot.png deleted file mode 100644 index f1103d10..00000000 Binary files a/plymouth/themes/futureprototype/password_dot.png and /dev/null differ diff --git a/plymouth/themes/futureprototype/password_dot16.png b/plymouth/themes/futureprototype/password_dot16.png deleted file mode 100644 index 4e3f3ceb..00000000 Binary files a/plymouth/themes/futureprototype/password_dot16.png and /dev/null differ diff --git a/plymouth/themes/futureprototype/password_field.png b/plymouth/themes/futureprototype/password_field.png deleted file mode 100644 index 46e899df..00000000 Binary files a/plymouth/themes/futureprototype/password_field.png and /dev/null differ diff --git a/plymouth/themes/futureprototype/password_field16.png b/plymouth/themes/futureprototype/password_field16.png deleted file mode 100644 index 4a173a69..00000000 Binary files a/plymouth/themes/futureprototype/password_field16.png and /dev/null differ diff --git a/plymouth/themes/futureprototype/plymouth_background_future.png b/plymouth/themes/futureprototype/plymouth_background_future.png deleted file mode 100644 index aada9a3c..00000000 Binary files a/plymouth/themes/futureprototype/plymouth_background_future.png and /dev/null differ diff --git a/plymouth/themes/homeworld/debian.png b/plymouth/themes/homeworld/debian.png deleted file mode 100644 index 434a0925..00000000 Binary files a/plymouth/themes/homeworld/debian.png and /dev/null differ diff --git a/plymouth/themes/homeworld/homeworld.plymouth b/plymouth/themes/homeworld/homeworld.plymouth deleted file mode 100644 index 04ee7613..00000000 --- a/plymouth/themes/homeworld/homeworld.plymouth +++ /dev/null @@ -1,8 +0,0 @@ -[Plymouth Theme] -Name=Default theme for Debian 11.0 Buster (WIP) -Description=A theme inspired by the Bauhaus movement -ModuleName=script - -[script] -ImageDir=/usr/share/plymouth/themes/homeworld -ScriptFile=/usr/share/plymouth/themes/homeworld/homeworld.script diff --git a/plymouth/themes/homeworld/homeworld.script b/plymouth/themes/homeworld/homeworld.script deleted file mode 100644 index e3e1fa57..00000000 --- a/plymouth/themes/homeworld/homeworld.script +++ /dev/null @@ -1,1058 +0,0 @@ -# homeworld.script - boot splash using script plugin -# -# Copyright (C) 2009 Canonical Ltd. -# Copyright © 2010-2021 Aurélien Couderc -# Copyright © 2014-2021 Juliette Taka -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. -# -# Written by: Alberto Milone -# -# Based on the example provided with the "script plugin" written by: -# Charlie Brej -# - - -#------------------------------- Constants ----------------------------------------- -NB_ROTATION_STEPS = 70; -NB_REFRESHS_BETWEEN_ANIMS = 3; - -# Initial position of the center of the logo in % of background -DEBIAN_POS_PCT.y = 0.68; # Debian image position in % of screen height -DEBIAN_HEIGHT_PCT = 0.07; # Debian image height in % of smallest screen dimension -LOGO_CENTER_PCT.x = 0.5; # Debian swirl image position in % of screen height & width -LOGO_CENTER_PCT.y = 0.5; -LOGO_SIZE_PCT = 0.18; # Debian swirl image size in % of smallest screen dimension - -#------------------------------- Globals ------------------------------------------- -# are we currently prompting for a password? -prompt_active = 0; - -# Globals to share progress time / percent with intersted functions -progress_time = 0; -progress_pct = 0; - -# Variables for glow rotation animation -anim_start_time = NULL; -anim_status = "stopped"; -refresh_iter = 0; -anim_iter = 0; - -#-----------------------------Text-image functions---------------------------- - -# Set the text colour in (rgb / 256) -text_colour.red = 1.0; -text_colour.green = 1.0; -text_colour.blue = 1.0; - -# Tinted text #988592 -tinted_text_colour.red = 1.0; -tinted_text_colour.green = 1.0; -tinted_text_colour.blue = 1.0; - -# Action Text - #ffffff - RGB 255 255 255 -action_text_colour.red = 1.0; -action_text_colour.green = 1.0; -action_text_colour.blue = 1.0; - -# Orange - #ff4012 - RGB 255 64 18 -debugsprite = Sprite(); -debugsprite_bottom = Sprite(); -debugsprite_bottom.SetPosition(0, (Window.GetHeight (0) - 20), 1); -debugsprite_medium = Sprite(); -debugsprite_medium.SetPosition(0, (Window.GetHeight (0) - 100), 1); - -# General purpose function to create text -fun WriteText (text, colour) { - image = Image.Text (text, colour.red, colour.green, colour.blue); - return image; -} - -fun ImageFromText (text) { - image = WriteText (text, text_colour); - return image; -} - -fun ImageFromTintedText (text) { - image = WriteText (text, tinted_text_colour); - return image; -} - -fun ImageFromActionText (text) { - image = WriteText (text, action_text_colour); - return image; -} - -fun Debug(text) { - debugsprite.SetImage(ImageFromText (text)); -} - -fun DebugBottom(text) { - debugsprite_bottom.SetImage(ImageFromText (text)); -} - -fun DebugMedium(text) { - debugsprite_medium.SetImage(ImageFromText (text)); -} - -#Debug("Window.GetHeight(0) = " + Window.GetHeight(0)); -fun TextYOffset() { - local.y; - local.text_height; - local.min_height; - - # Put the 1st line below the logo + some spacing - y = debian_sprite.GetY() + debian.GetHeight(); - #Debug("y = " + y); - - text_height = first_line_height * 7.5; - min_height = window_max.height; - #Debug("text_height=" + text_height + "; min_height=" + min_height); - - if (y + text_height > min_height) - y = min_height - text_height; - - return y; -} - - -#----------------------------- Screen/window setup --------------------------- -# Compute screen/image ratio and scale the background accordingly -window_max.width = Window.GetX() * 2 + Window.GetWidth(); -window_max.height = Window.GetY() * 2 + Window.GetHeight(); -screen_ratio = window_max.width / window_max.height; -small_dimension = Math.Min(window_max.width, window_max.height); -#Debug("Window.GetX():" + Window.GetX() + ", Window.GetY():" + Window.GetY()); -#Debug("Window is [" + window_max.width + ";" + window_max.height + "], ratio=" + screen_ratio); - -debian_height = small_dimension * DEBIAN_HEIGHT_PCT; -debian_pos.y = window_max.height * DEBIAN_POS_PCT.y - debian_height/2; -logo_size = small_dimension * LOGO_SIZE_PCT; -logo_center.x = window_max.width * LOGO_CENTER_PCT.x; -logo_center.y = window_max.height * LOGO_CENTER_PCT.y; -#Debug("Logo center at [" + logo_center.x + ";" + logo_center.y + "], size=" + logo_size + "px"); - -logo_pos.x = logo_center.x - logo_size/2; -logo_pos.y = logo_center.y - logo_size/2; - -#------------------------------- Background ---------------------------------------- -bg_image = Image("plymouth_background_homeworld.png"); -scaled_bg_image = bg_image.Scale(window_max.width, window_max.height); - -# Display background -bg_sprite = Sprite(scaled_bg_image); -bg_sprite.SetPosition(Window.GetX() + Window.GetWidth() / 2 - scaled_bg_image.GetWidth() / 2, - Window.GetY() + Window.GetHeight() / 2 - scaled_bg_image.GetHeight() / 2, - -1000); - -#------------------------------- Debian ---------------------------------------------- -debian = Image("debian.png"); -# Target same height as logo -debian_scale_factor = debian_height / debian.GetHeight(); -debian = debian.Scale(debian.GetWidth() * debian_scale_factor, - debian.GetHeight() * debian_scale_factor); -debian_sprite = Sprite(debian); -debian_sprite.SetPosition(window_max.width / 2 - debian.GetWidth() / 2, - debian_pos.y, - -90); - -#------------------------------- Logo ---------------------------------------------- -logo = Image("logo.png"); -logo_scale_factor = logo_size / logo.GetWidth(); -logo = logo.Scale(logo.GetWidth() * logo_scale_factor, - logo.GetHeight() * logo_scale_factor); -logo_to_top_edge = Window.GetHeight() * 0.3; -logo_sprite = Sprite(logo); -logo_sprite.SetPosition(logo_pos.x, logo_pos.y, -50); - - -logo_glow = Image("logo_circle.png"); -logo_glow_scale_factor = logo_size / logo_glow.GetWidth(); -logo_glow[0] = logo_glow.Scale(logo_glow.GetWidth() * logo_glow_scale_factor, - logo_glow.GetHeight() * logo_glow_scale_factor); -logo_glow_sprite = Sprite(); -logo_glow_sprite.SetPosition(logo_pos.x, logo_pos.y, -60); -logo_glow_sprite.SetImage(logo_glow[0]); - - - -#------------------------------String functions------------------------------- - -# This is the equivalent for strstr() -fun StringString(string, substring) { - start = 0; - while (String(string).CharAt (start)) { - walk = 0; - while (String(substring).CharAt (walk) == String(string).CharAt (start + walk) ) { - walk++; - if (!String(substring).CharAt (walk)) return start; - } - start++; - } - - return NULL; -} - -fun StringLength (string) { - index = 0; - while (String(string).CharAt(index)) index++; - return index; -} - -fun StringCopy (source, beginning, end) { - local.destination = ""; - for (index = beginning; ( ( (end == NULL) || (index <= end) ) && (String(source).CharAt(index)) ); index++) { - local.destination += String(source).CharAt(index); - } - - return local.destination; -} - -fun StringReplace (source, pattern, replacement) { - local.found = StringString(source, pattern); - if (local.found == NULL) - return source; - - local.new_string = StringCopy (source, 0, local.found - 1) + - replacement + - StringCopy (source, local.found + StringLength(pattern), NULL); - - return local.new_string; -} - -# it makes sense to use it only for -# numbers up to 100 -fun StringToInteger (str) { - int = -1; - for (i=0; i<=100; i++) { - if (i+"" == str) { - int = i; - break; - } - } - return int; -} - -#----------------------------------------------------------------------------- -# Top background colour -# #010027 --> 0.004, 0.0, 0.153 -# Bottom background colour -# #010027 --> 0.004, 0.0, 0.153 -# -Window.SetBackgroundTopColor (0.004, 0.0, 0.153); # Nice colour on top of the screen fading to -Window.SetBackgroundBottomColor (0.004, 0.0, 0.153); # an equally nice colour on the bottom - -bits_per_pixel = Window.GetBitsPerPixel (); -# TODO need to handle 16 colors ? -#if (bits_per_pixel == 4) { -# logo_filename = "debian_logo16.png"; -# progress_dot_off_filename = "progress_dot_off16.png"; -# progress_dot_on_filename = "progress_dot_on16.png"; -# password_dot_filename = "password_dot.png"; -# password_field_filename = "password_field16.png"; -#} else { -# logo_filename = "debian_logo.png"; -# progress_dot_off_filename = "progress_dot_off.png"; -# progress_dot_on_filename = "progress_dot_on.png"; - password_dot_filename = "password_dot.png"; - password_field_filename = "password_field.png"; -#} - -message_notification[0].image = ImageFromTintedText (""); -message_notification[1].image = ImageFromTintedText (""); -fsck_notification.image = ImageFromActionText (""); - -status = "normal"; - -# use a fixed string with ascending and descending stems to calibrate the -# bounding box for the first message, so the messages below don't move up -# and down according to *their* height. -first_line_height = ImageFromTintedText ("AfpqtM").GetHeight(); - -# if the user has a 640x480 or 800x600 display, we can't quite fit everything -# (including passphrase prompts) with the target spacing, so scoot the text up -# a bit if needed. -top_of_the_text = TextYOffset(); - - -#-------------------------------Progress Indicator----------------------------- -# Implement in boot progress callback -fun animate_progress_indicator (time, progress) { - progress_time = time; - progress_pct = progress; - - #Debug ("mode = " + Plymouth.GetMode() + ", progress_time = " + progress_time + ", progress_pct = " + progress_pct); - -} - - -#-----------------------------------------Label utility functions--------------------- - -# label should be either a string or NULL -# Images for n lines will be created and returned as items of the -# message_label array -# -fun get_message_label (label, is_fake, is_action_line) { - #Debug("Get Label position"); - local.message_label; - - if (is_fake) - # Create a fake label so as to get the y coordinate of - # a standard-length label. - local.message_image = ImageFromTintedText ("This is a fake message"); - else - local.message_image = (is_action_line) && ImageFromActionText (label) || ImageFromTintedText (label); - - message_label.width = message_image.GetWidth (); - message_label.height = message_image.GetHeight (); - - # Center the line horizontally - message_label.x = Window.GetX () + Window.GetWidth () / 2 - message_label.width / 2; - - message_label.y = top_of_the_text; - - # Put the 2nd line below the fsck line - if (is_action_line) { - local.fsck_label.y = message_label.y + (first_line_height + first_line_height / 2); - message_label.y = local.fsck_label.y + (first_line_height * 1.5); - } - - #Debug("action label x = " + message_label.x + " y = " + message_label.y ); - -# message_debug = "msg_x = " + message_label.x + " msg_y = " + message_label.y + -# "msg_width = " + message_label.width + " msg_height = " + -# message_label.height + " message = " + label; -# Debug(message_debug); - - return message_label; - -} - -# Create an fsck label and/or get its position -fun get_fsck_label (label, is_fake) { - # Debug("Get Label position"); - local.fsck_label = global.progress_label; - - if (is_fake) - fsck_label.image = ImageFromTintedText ("This is a fake message"); - else - fsck_label.image = ImageFromTintedText (label); - - fsck_label.width = fsck_label.image.GetWidth (); - fsck_label.height = fsck_label.image.GetHeight (); - - # Centre the label horizontally - fsck_label.x = Window.GetX () + Window.GetWidth () / 2 - fsck_label.width / 2; - - local.first_label = get_message_label (label, 1, 0); - - # Place the label below the 1st message line - fsck_label.y = local.first_label.y + local.first_label.height + (local.first_label.height / 2); - -# message_debug = "msg_x = " + fsck_label.x + " msg_y = " + fsck_label.y + -# "msg_width = " + fsck_label.width + " msg_height = " + -# fsck_label.height + " message = " + label; -# Debug(message_debug); - - return fsck_label; -} - -#-----------------------------------------Message stuff -------------------------------- -# - -# Set up a message label -# -# NOTE: this is called when doing something like 'plymouth message "hello world"' -# -fun setup_message (message_text, x, y, z, index) { - #DebugMedium("Message setup: " + message_text); - global.message_notification[index].image = (index) && ImageFromActionText (message_text) || ImageFromTintedText (message_text); - - # Set up the text message, if any - message_notification[index].x = x; - message_notification[index].y = y; - message_notification[index].z = z; - - message_notification[index].sprite = Sprite (); - message_notification[index].sprite.SetImage (message_notification[index].image); - message_notification[index].sprite.SetX (message_notification[index].x); - message_notification[index].sprite.SetY (message_notification[index].y); - message_notification[index].sprite.SetZ (message_notification[index].z); - -} - -fun show_message (index) { - if (global.message_notification[index].sprite) global.message_notification[index].sprite.SetOpacity(1); -} - -fun hide_message (index) { - if (global.message_notification[index].sprite) global.message_notification[index].sprite.SetOpacity(0); -} - - - - -# the callback function is called when new message should be displayed. -# First arg is message to display. -fun message_callback (message) -{ - # Debug("Message callback"); - is_fake = 0; - if (!message || (message == "")) is_fake = 1; - - local.substring = "keys:"; - - # Look for the "keys:" prefix - local.keys = StringString(message, local.substring); - - local.is_action_line = (keys != NULL); - #Debug("keys " + local.keys + " substring length = " + StringLength(local.substring)); - - # Get the message without the "keys:" prefix - if (keys != NULL) - message = StringCopy (message, keys + StringLength(local.substring), NULL); - - # Get the message without the "fsckd-cancel-msg" prefix as we don't support i18n - substring = "fsckd-cancel-msg:"; - keys = StringString(message, substring); - if (keys != NULL) - message = StringCopy(message, keys + StringLength(substring), NULL); - - local.label.is_fake = is_fake; - label = get_message_label(message, is_fake, is_action_line); - label.z = 10000; - - setup_message (message, label.x, label.y, label.z, is_action_line); - if (prompt_active && local.is_action_line) - hide_message (is_action_line); - else - show_message (is_action_line); - -} - - -#-----------------------------------------Display Password stuff ----------------------- -# - -fun password_dialogue_setup (message_label) { - #Debug("Password dialog setup"); - - local.entry; - local.bullet_image; - - bullet_image = Image (password_dot_filename); - entry.image = Image (password_field_filename); - - # Hide the normal labels - prompt_active = 1; - if (message_notification[1].sprite) hide_message (1); - - # Set the prompt label - label = get_message_label(message_label, 0, 1); - label.z = 10000; - - setup_message (message_label, label.x, label.y, label.z, 2); - show_message (2); - - # Set up the text entry which contains the bullets - entry.sprite = Sprite (); - entry.sprite.SetImage (entry.image); - - # Centre the box horizontally - entry.x = Window.GetX () + Window.GetWidth () / 2 - entry.image.GetWidth () / 2; - - # Put the entry below the second label. - entry.y = message_notification[2].y + label.height * 1.5; - - #DebugMedium("entry x = " + entry.x + ", y = " + entry.y); - entry.z = 10000; - entry.sprite.SetX (entry.x); - entry.sprite.SetY (entry.y); - entry.sprite.SetZ (entry.z); - - global.password_dialogue = local; -} - -fun password_dialogue_opacity (opacity) { - #Debug("Setting password dialog opacity to " + opacity); - global.password_dialogue.opacity = opacity; - local = global.password_dialogue; - - # You can make the box translucent with a float - # entry.sprite.SetOpacity (0.3); - entry.sprite.SetOpacity (opacity); - label.sprite.SetOpacity (opacity); - - if (bullets) { - for (index = 0; bullets[index]; index++) { - bullets[index].sprite.SetOpacity (opacity); - } - } -} - - -# The callback function is called when the display should display a password dialogue. -# First arg is prompt string, the second is the number of bullets. -fun display_password_callback (prompt, bullets) { - #Debug("Password dialog setup"); - - global.status = "password"; - if (!global.password_dialogue) password_dialogue_setup(prompt); - password_dialogue_opacity (1); - bullet_width = password_dialogue.bullet_image.GetWidth(); - bullet_y = password_dialogue.entry.y + - password_dialogue.entry.image.GetHeight () / 2 - - password_dialogue.bullet_image.GetHeight () / 2; - margin = bullet_width; - spaces = Math.Int( (password_dialogue.entry.image.GetWidth () - (margin * 2)) / (bullet_width / 2 ) ); - #DebugMedium ("spaces = " + spaces + ", bullets = " + bullets); - bullets_area.width = margin + spaces * (bullet_width / 2); - bullets_area.x = Window.GetX () + Window.GetWidth () / 2 - bullets_area.width / 2; - #DebugBottom ("pwd_entry (x,y) = " + password_dialogue.entry.x + "," + password_dialogue.entry.y - # + "), bullets_area.x = " + bullets_area.x + ", bullets_area.width = " + bullets_area.width); - if (bullets > spaces) - bullets = spaces; - for (index = 0; password_dialogue.bullets[index] || index < bullets; index++){ - if (!password_dialogue.bullets[index]) { - password_dialogue.bullets[index].sprite = Sprite (); - password_dialogue.bullets[index].sprite.SetImage (password_dialogue.bullet_image); - password_dialogue.bullets[index].x = bullets_area.x + # password_dialogue.entry.x + margin + - index * bullet_width / 2; - password_dialogue.bullets[index].sprite.SetX (password_dialogue.bullets[index].x); - password_dialogue.bullets[index].y = bullet_y; - password_dialogue.bullets[index].sprite.SetY (password_dialogue.bullets[index].y); - password_dialogue.bullets[index].z = password_dialogue.entry.z + 1; - password_dialogue.bullets[index].sprite.SetZ (password_dialogue.bullets[index].z); - } - - password_dialogue.bullets[index].sprite.SetOpacity (0); - - if (index < bullets) { - password_dialogue.bullets[index].sprite.SetOpacity (1); - } - } -} - -Plymouth.SetDisplayPasswordFunction (display_password_callback); - -Plymouth.SetMessageFunction (message_callback); - -Plymouth.SetBootProgressFunction (animate_progress_indicator); - -# Plymouth.SetBootProgressFunction: the callback function is called with two numbers, the progress (between 0 and 1) and the time spent booting so far -# Plymouth.SetRootMountedFunction: the callback function is called when a new root is mounted -# Plymouth.SetKeyboardInputFunction: the callback function is called with a string containing a new character entered on the keyboard - -#----------------------------------------- FSCK Counter -------------------------------- - -# Initialise the counter -fun init_fsck_count () { - # The number of fsck checks in this cycle - global.counter.total = 0; - # The number of fsck checks already performed + the current one - global.counter.current = 1; - # The previous fsck - global.counter.last = 0; -} - -# Increase the total counter -fun increase_fsck_count () { - global.counter.total++; -} - -fun increase_current_fsck_count () { - global.counter.last = global.counter.current++; -} - -# Clear the counter -fun clear_fsck_count () { - global.counter = NULL; - init_fsck_count (); -} - -#----------------------------------------- Progress Label ------------------------------ - - -# Change the opacity level of a progress label -# -# opacity = 1 -> show -# opacity = 0 -> hide -# opacity = 0.3 (or any other float) -> translucent -# -fun set_progress_label_opacity (opacity) { - # the label - progress_label.sprite.SetOpacity (opacity); - - # Make the slot available again when hiding the bar - # So that another bar can take its place - if (opacity == 0) { - progress_label.is_available = 1; - progress_label.device = ""; - } -} - -# Set up a new Progress Bar -# -# TODO: Make it possible to reuse (rather than recreate) a bar -# if .is_available = 1. Ideally this would just reset the -# label, the associated -# device and the image size of the sprite. - -fun init_progress_label (device, status_string) { - # Make the slot unavailable - global.progress_label.is_available = 0; - progress_label.progress = 0; - progress_label.device = device; - progress_label.status_string = status_string; -} - -# See if the progress label is keeping track of the fsck -# of "device" -# -fun device_has_progress_label (device) { - #DebugBottom ("label device = " + progress_label.device + " checking device " + device); - return (progress_label.device == device); -} - -# Update the Progress bar which corresponds to index -# -fun update_progress_label (progress) { - # If progress is NULL then we just refresh the label. - # This happens when only counter.total has changed. - if (progress != NULL) { - progress_label.progress = progress; - - #Debug("device " + progress_label.device + " progress " + progress); - - # If progress >= 100% hide the label and make it available again - if (progress >= 100) { - set_progress_label_opacity (0); - - # See if we any other fsck check is complete - # and, if so, hide the progress bars and the labels - on_fsck_completed (); - - return 0; - } - } - # Update progress label here - # - # FIXME: the queue logic from this theme should really be moved into mountall - # instead of using string replacement to deal with localised strings. - label = StringReplace (progress_label.status_string[0], "%1$d", global.counter.current); - label = StringReplace (label, "%2$d", global.counter.total); - label = StringReplace (label, "%3$d", progress_label.progress); - label = StringReplace (label, "%%", "%"); - - progress_label = get_fsck_label (label, 0); - #progress_label.progress = progress; - - progress_label.sprite = Sprite (progress_label.image); - - # Set up the bar - progress_label.sprite.SetPosition(progress_label.x, progress_label.y, 1); - - set_progress_label_opacity (1); - -} - -# Refresh the label so as to update counters -fun refresh_progress_label () { - update_progress_label (NULL); -} - -#----------------------------------------- FSCK Queue ---------------------------------- - -# Initialise the fsck queue -fun init_queue () { - global.fsck_queue[0].device; - global.fsck_queue[0].progress; - global.fsck_queue.counter = 0; - global.fsck_queue.biggest_item = 0; -} - -fun clear_queue () { - global.fsck_queue = NULL; - init_queue (); -} - -# Return either the device index in the queue or -1 -fun queue_look_up_by_device (device) { - for (i=0; i <= fsck_queue.biggest_item; i++) { - if ((fsck_queue[i]) && (fsck_queue[i].device == device)) - return i; - } - return -1; -} - -# Keep track of an fsck process in the queue -fun add_fsck_to_queue (device, progress) { - # Look for an empty slot in the queue - for (i=0; global.fsck_queue[i].device; i++) { - continue; - } - local.index = i; - - # Set device and progress - global.fsck_queue[local.index].device = device; - global.fsck_queue[local.index].progress = progress; - - # Increase the queue counter - global.fsck_queue.counter++; - - # Update the max index of the array for iterations - if (local.index > global.fsck_queue.biggest_item) - global.fsck_queue.biggest_item = local.index; - - #DebugMedium ("Adding " + device + " at " + local.index); -} - -fun is_queue_empty () { - return (fsck_queue.counter == 0); -} - -fun is_progress_label_available () { - return (progress_label.is_available == 1); -} - - -# This should cover the case in which the fsck checks in -# the queue are completed before the ones showed in the -# progress label -fun on_queued_fsck_completed () { - if (!is_queue_empty ()) - return; - - # Hide the extra label, if any - #if (progress_bar.extra_label.sprite) - # progress_bar.extra_label.sprite.SetOpacity(0); -} - -fun remove_fsck_from_queue (index) { - # Free memory which was previously allocated for - # device and progress - global.fsck_queue[index].device = NULL; - global.fsck_queue[index].progress = NULL; - - # Decrease the queue counter - global.fsck_queue.counter--; - - # See if there are other processes in the queue - # if not, clear the extra_label - on_queued_fsck_completed (); -} - -fun on_fsck_completed () { - # We have moved on to tracking the next fsck - increase_current_fsck_count (); - - if (!is_progress_label_available ()) - return; - - if (!is_queue_empty ()) - return; - - # Hide the progress label - if (progress_label.sprite) - progress_label.sprite.SetOpacity (0); - - # Clear the queue - clear_queue (); - - # Clear the fsck counter - clear_fsck_count (); -} - -# Update an fsck process that we keep track of in the queue -fun update_progress_in_queue (index, device, progress) { - # If the fsck is complete, remove it from the queue - if (progress >= 100) { - remove_fsck_from_queue (index); - on_queued_fsck_completed (); - return; - } - - global.fsck_queue[index].device = device; - global.fsck_queue[index].progress = progress; - -} - -# TODO: Move it to some function -# Create an empty queue -#init_queue (); - - -#----------------------------------------- FSCK Functions ------------------------------ - - -# Either add a new bar for fsck checks or update an existing bar -# -# NOTE: no more than "progress_bar.max_number" bars are allowed -# -fun fsck_check (device, progress, status_string) { - - # The 1st time this will take place - if (!global.progress_label) { - # Increase the fsck counter - increase_fsck_count (); - - # Set up a new label for the check - init_progress_label (device, status_string); - update_progress_label (progress); - - return; - } - - - if (device_has_progress_label (device)) { - # Update the progress of the existing label - update_progress_label (progress); - } - else { - # See if there's already a slot in the queue for the device - local.queue_device_index = queue_look_up_by_device(device); - - # See if the progress_label is available - if (progress_label.is_available) { - -# local.my_string = "available index " + local.available_index + " progress_bar counter is " + progress_bar.counter; -# Debug(local.my_string); - - - # If the fsck check for the device was in the queue, then - # remove it from the queue - if (local.queue_device_index >= 0) { - remove_fsck_from_queue (index); - } - else { - # Increase the fsck counter - increase_fsck_count (); - } - -# local.my_string += local.message; - #Debug("setting new label for device " + device + " progress " + progress); - - # Set up a new label for the check - init_progress_label (device, status_string); - update_progress_label (progress); - - } - # If the progress_label is not available - else { - - # If the fsck check for the device is already in the queue - # just update its progress in the queue - if (local.queue_device_index >= 0) { - #DebugMedium("Updating queue at " + local.queue_device_index + " for device " + device); - update_progress_in_queue (local.queue_device_index, device, progress); - } - # Otherwise add the check to the queue - else { - #DebugMedium("Adding device " + device + " to queue at " + local.queue_device_index); - add_fsck_to_queue (device, progress); - - # Increase the fsck counter - increase_fsck_count (); - - refresh_progress_label (); - } - - } - } - -# if (!is_queue_empty ()) { -# DebugBottom("Extra label for "+ device); - #} -# else { -# DebugBottom("No extra label for " + device + ". 1st Device in the queue "+ fsck_queue[0].device + " counter = " + global.fsck_queue.counter); -# } -} - - -#-----------------------------------------Update Status stuff -------------------------- -# -# The update_status_callback is what we can use to pass plymouth whatever we want so -# as to make use of features which are available only in this program (as opposed to -# being available for any theme for the script plugin). -# -# Example: -# -# Thanks to the current implementation, some scripts can call "plymouth --update=fsck:sda1:40" -# and this program will know that 1) we're performing and fsck check, 2) we're checking sda1, -# 3) the program should set the label progress to 40% -# -# Other features can be easily added by parsing the string that we pass plymouth with "--update" -# -fun update_status_callback (status) { -# Debug(status); - if (!status) return; - - string_it = 0; - update_strings[string_it] = ""; - - for (i=0; (String(status).CharAt(i) != ""); i++) { - local.temp_char = String(status).CharAt(i); - if (temp_char != ":") - update_strings[string_it] += temp_char; - else - update_strings[++string_it] = ""; - } - -# my_string = update_strings[0] + " " + update_strings[1] + " " + update_strings[2]; -# Debug(my_string); - # Let's assume that we're dealing with these strings fsck:sda1:40 - if ((string_it >= 2) && (update_strings[0] == "fsck")) { - - device = update_strings[1]; - progress = update_strings[2]; - status_string[0] = update_strings[3]; # "Checking disk %1$d of %2$d (%3$d %% complete)" - if (!status_string[0]) - status_string[0] = "Checking disk %1$d of %2$d (%3$d %% complete)"; - - if ((device != "") && (progress != "")) { - progress = StringToInteger (progress); - - # Make sure that the fsck_queue is initialised - if (!global.fsck_queue) - init_queue (); - - # Make sure that the fsck counter is initialised - if (!global.counter) - init_fsck_count (); - -# if (!global.progress_bar.extra_label.sprite) -# create_extra_fsck_label (); - - # Keep track of the fsck check - fsck_check (device, progress, status_string); - } - - } - - # systemd-fsckd pass fsckd::: - if (update_strings[0] == "fsckd") { - number_devices = StringToInteger(update_strings[1]); - - if (number_devices > 0) { - label = update_strings[3]; - - progress_label = get_fsck_label (label, 0); - progress_label.sprite = Sprite (progress_label.image); - progress_label.sprite.SetPosition(progress_label.x, progress_label.y, 1); - progress_label.sprite.SetOpacity (1); - } else { - if (progress_label.sprite) - progress_label.sprite.SetOpacity (0); - } - } - -} -Plymouth.SetUpdateStatusFunction (update_status_callback); - -#-----------------------------------------Display Question stuff ----------------------- -# -# TODO: Implement this if needed -# -# The callback function is called when the display should display a question dialogue. -# First arg is prompt string, the second is the entry contents. -#fun display_question_callback (prompt_string, entry_contents) -#{ -# time++; -#} -# -#Plymouth.SetDisplayQuestionFunction (display_question_callback); - -fun rotate_img(source_img, current_step, nb_steps) { - angle = Math.Sin(current_step / nb_steps * Math.Pi / 2) * 2 * Math.Pi; - #debug_sin = Math.Sin(current_step / nb_steps * Math.Pi / 2); - #DebugMedium("Sin = " + debug_sin); - rotated_img = source_img.Rotate(angle); - return rotated_img; -} - -fun update_glow_anim () { - if (global.anim_start_time != global.progress_time && global.anim_status != "running") { - global.anim_start_time = global.progress_time; - global.anim_iter = 0; - global.anim_status = "running"; - } - - if (global.anim_status == "running") { - iter_img = global.logo_glow[global.anim_iter]; - if (iter_img == NULL) { - # Generate rotated image for the glow around the logo on demand. - #DebugMedium("Generating rotated image for index " + global.anim_iter); - iter_img = rotate_img(logo_glow[0], global.anim_iter, NB_ROTATION_STEPS); - global.logo_glow[global.anim_iter] = iter_img; - } - global.logo_glow_sprite.SetImage(iter_img); - global.anim_iter++; - - if (global.anim_iter >= NB_ROTATION_STEPS) { - global.anim_status = "stopped"; - } - } -} - -#-----------------------------------------Refresh stuff -------------------------------- -# -# Calling Plymouth.SetRefreshFunction with a function will set that function to be -# called up to 50 times every second, e.g. -# -# NOTE: if a refresh function is not set, Plymouth doesn't seem to be able to update -# the screen correctly -# -fun refresh_callback () -{ - global.refresh_iter++; - if (global.refresh_iter == NB_REFRESHS_BETWEEN_ANIMS) { - global.refresh_iter = 0; - update_glow_anim(); - } - #DebugBottom ("refresh_iter=" + refresh_iter + "; anim_status=" + anim_status + "; anim_start_time=" + anim_start_time + "; anim_iter=" + anim_iter); -} -Plymouth.SetRefreshFunction (refresh_callback); - - -#-----------------------------------------Display Normal stuff ----------------------- -# -# The callback function is called when the display should return to normal -fun display_normal_callback () -{ - global.status = "normal"; - if (global.password_dialogue) { - password_dialogue_opacity (0); - global.password_dialogue = NULL; - if (message_notification[2].sprite) hide_message(2); - prompt_active = 0; - } - - if (message_notification[1].sprite) { - show_message (1); - } - -} - -Plymouth.SetDisplayNormalFunction (display_normal_callback); - - -#----------------------------------------- Quit -------------------------------- - -fun quit_callback () -{ -} - -Plymouth.SetQuitFunction(quit_callback); diff --git a/plymouth/themes/homeworld/logo.png b/plymouth/themes/homeworld/logo.png deleted file mode 100644 index f228662d..00000000 Binary files a/plymouth/themes/homeworld/logo.png and /dev/null differ diff --git a/plymouth/themes/homeworld/logo_circle.png b/plymouth/themes/homeworld/logo_circle.png deleted file mode 100644 index ed3bf4be..00000000 Binary files a/plymouth/themes/homeworld/logo_circle.png and /dev/null differ diff --git a/plymouth/themes/homeworld/password_dot.png b/plymouth/themes/homeworld/password_dot.png deleted file mode 100644 index f1103d10..00000000 Binary files a/plymouth/themes/homeworld/password_dot.png and /dev/null differ diff --git a/plymouth/themes/homeworld/password_dot16.png b/plymouth/themes/homeworld/password_dot16.png deleted file mode 100644 index 4e3f3ceb..00000000 Binary files a/plymouth/themes/homeworld/password_dot16.png and /dev/null differ diff --git a/plymouth/themes/homeworld/password_field.png b/plymouth/themes/homeworld/password_field.png deleted file mode 100644 index 6afe1f52..00000000 Binary files a/plymouth/themes/homeworld/password_field.png and /dev/null differ diff --git a/plymouth/themes/homeworld/password_field16.png b/plymouth/themes/homeworld/password_field16.png deleted file mode 100644 index 4a173a69..00000000 Binary files a/plymouth/themes/homeworld/password_field16.png and /dev/null differ diff --git a/plymouth/themes/homeworld/plymouth_background_homeworld.png b/plymouth/themes/homeworld/plymouth_background_homeworld.png deleted file mode 100644 index 1c139a1a..00000000 Binary files a/plymouth/themes/homeworld/plymouth_background_homeworld.png and /dev/null differ