From be83cf3d149f5839b8cb7b5e612e404dab7d6541 Mon Sep 17 00:00:00 2001 From: hirnidrin Date: Sun, 24 Sep 2023 20:04:57 +0200 Subject: [PATCH] feat: Allow multiple *.just files, concat them on build. --- Containerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Containerfile b/Containerfile index 3a46c4910b0..73ef847b144 100644 --- a/Containerfile +++ b/Containerfile @@ -16,7 +16,7 @@ ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION}" ARG PACKAGE_LIST="bluefin" COPY usr /usr -COPY just/custom.just /tmp/just/custom.just +COPY just /tmp/just COPY etc/yum.repos.d/ /etc/yum.repos.d/ COPY packages.json /tmp/packages.json COPY build.sh /tmp/build.sh @@ -48,7 +48,7 @@ RUN /tmp/build.sh && \ systemctl enable dconf-update.service && \ fc-cache -f /usr/share/fonts/ubuntu && \ fc-cache -f /usr/share/fonts/inter && \ - cat /tmp/just/custom.just >> /usr/share/ublue-os/just/60-custom.just && \ + find /tmp/just -iname '*.just' -exec printf "\n\n" \; -exec cat {} \; >> /usr/share/ublue-os/just/60-custom.just && \ rm -f /etc/yum.repos.d/tailscale.repo && \ rm -f /usr/share/applications/fish.desktop && \ rm -f /usr/share/applications/htop.desktop && \