From 5a1d2a1dae7a32e4cfb62cacf48c3700ce2f56f1 Mon Sep 17 00:00:00 2001 From: humocs-man <251756307+humocs-man@users.noreply.github.com> Date: Sun, 1 Mar 2026 15:58:27 +0100 Subject: [PATCH] added missing systemfile-integration --- build/10-build.sh | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/build/10-build.sh b/build/10-build.sh index 02eb84b..8a757c6 100755 --- a/build/10-build.sh +++ b/build/10-build.sh @@ -10,20 +10,26 @@ set -eoux pipefail # shellcheck source=/dev/null source /ctx/build/copr-helpers.sh - # Enable nullglob for all glob operations to prevent failures on empty matches shopt -s nullglob -echo "::group:: Copy Bluefin Config from Common" +echo "::group:: Apply Bluefin common system files" +# Bringt Flatpak-Preinstall, Flathub-Remote, systemd-Units, Defaults, etc. +cp -a /ctx/oci/common/bluefin/system_files/. / +echo "::endgroup::" +echo "::group:: Apply Brew integration" +# Bringt Brew-User, PATH, systemd-Units, Brew-Bundle-Mechanik +cp -a /ctx/oci/brew/system_files/. / +echo "::endgroup::" + +echo "::group:: Copy Bluefin Config from Common" mkdir -p /usr/share/ublue-os/just/ cp -r /ctx/oci/common/bluefin/usr/share/ublue-os/just/* /usr/share/ublue-os/just/ - echo "::endgroup::" echo "::group:: Install Packages" - -# Base utilities +# flatpak und just sind im base-main vorhanden, aber wir ergänzen deine Tools dnf5 install -y \ fastfetch \ btop \ @@ -38,50 +44,38 @@ dnf5 install -y \ virt-manager \ virt-viewer \ usbredir - echo "::endgroup::" echo "::group:: Remove Firefox Systempackage" - dnf5 remove -y \ firefox \ firefox-langpacks\* - echo "::endgroup::" - - echo "::group:: Copy Custom Files" - +# Brewfiles → werden durch Brew-Bundle.service verarbeitet mkdir -p /usr/share/ublue-os/homebrew/ cp /ctx/custom/brew/*.Brewfile /usr/share/ublue-os/homebrew/ +# Just-Rezepte → werden durch just automatisch gefunden find /ctx/custom/ujust -iname '*.just' -exec printf "\n\n" \; -exec cat {} \; \ >> /usr/share/ublue-os/just/60-custom.just +# Flatpak-Preinstall-Skripte → werden durch flatpak-preinstall.service ausgeführt mkdir -p /etc/flatpak/preinstall.d/ cp /ctx/custom/flatpaks/*.preinstall /etc/flatpak/preinstall.d/ - - echo "::endgroup::" - echo "::group:: Installing COSMIC" - copr_install_isolated "ryanabx/cosmic-epoch" \ cosmic-desktop - echo "::endgroup::" - echo "::group:: System Configuration" - systemctl enable podman.socket systemctl enable bluetooth.service systemctl enable libvirtd.service systemctl enable virtlogd.service - - echo "::endgroup::" shopt -u nullglob