diff --git a/Containerfile b/Containerfile index e64b3c4..fa196ca 100644 --- a/Containerfile +++ b/Containerfile @@ -1,8 +1,8 @@ FROM registry.fedoraproject.org/fedora:latest AS builder -RUN dnf update -y && dnf install --disablerepo='*' --enablerepo='fedora,updates' --setopt install_weak_deps=0 --nodocs --assumeyes wget && dnf clean all +RUN dnf update -y && dnf install --disablerepo='*' --enablerepo='fedora,updates' --setopt install_weak_deps=0 --nodocs --assumeyes git wget unzip && dnf clean all -RUN mkdir -p /tmp/ublue-os/files/{etc,usr} +RUN mkdir -p /tmp/ublue-os/files/{etc,usr} && mkdir /tmp/ublue-os/rpms COPY usr /tmp/ublue-os/files/usr COPY etc /tmp/ublue-os/files/etc diff --git a/fetch.sh b/fetch.sh index b623266..0797d4d 100644 --- a/fetch.sh +++ b/fetch.sh @@ -2,15 +2,25 @@ set -euo pipefail FILES_ROOT="/tmp/ublue-os/files" -git clone 'https://github.com/ryanoasis/nerd-fonts' /tmp/nerdfonts -mv /tmp/nerdfonts/patched-fonts/* "$FILES_ROOT/usr/share/fonts" - git clone 'https://github.com/dnkmmr69420/nix-installer-scripts' /tmp/nix-installer-scripts -mv /tmp/nix-installers-scripts/installer-scripts/silverblue-nix-installer.sh "$FILES_ROOT/usr/bin/ublue-nix-install" -mv /tmp/nix-installers-scripts/uninstaller-scripts/silverblue-nix-uninstaller.sh "$FILES_ROOT/usr/bin/ublue-nix-uninstall" +install -c -m 0755 /tmp/nix-installer-scripts/installer-scripts/silverblue-nix-installer.sh "$FILES_ROOT/usr/bin/ublue-nix-install" +install -c -m 0755 /tmp/nix-installer-scripts/uninstaller-scripts/silverblue-nix-uninstaller.sh "$FILES_ROOT/usr/bin/ublue-nix-uninstall" wget -O /tmp/devpod "https://github.com/loft-sh/devpod/releases/latest/download/devpod-linux-amd64" install -c -m 0755 /tmp/devpod "$FILES_ROOT/usr/bin" wget -O /tmp/devpod.rpm https://github.com/loft-sh/devpod/releases/latest/download/DevPod_linux_x86_64.rpm -mv /tmp/devpod.rpm /tmp/ublue-os/rpms \ No newline at end of file +mv /tmp/devpod.rpm /tmp/ublue-os/rpms + +wget -O /tmp/inter.zip 'https://github.com/rsms/inter/releases/download/v3.19/Inter-3.19.zip' +mkdir /tmp/inter +unzip /tmp/inter.zip -d "/tmp/inter" +mv "/tmp/inter/Inter Desktop/" "$FILES_ROOT/usr/share/fonts" + +wget -O /tmp/ubuntu.zip 'https://assets.ubuntu.com/v1/0cef8205-ubuntu-font-family-0.83.zip' +unzip /tmp/ubuntu.zip -d "/tmp/ubuntu" +rm -rf /tmp/ubuntu/__MACOSX +mv /tmp/ubuntu/* "$FILES_ROOT/usr/share/fonts" + +git clone --depth 1 'https://github.com/ryanoasis/nerd-fonts' /tmp/nerdfonts +mv /tmp/nerdfonts/patched-fonts/* "$FILES_ROOT/usr/share/fonts" \ No newline at end of file diff --git a/usr/bin/.gitkeep b/usr/bin/.gitkeep new file mode 100644 index 0000000..e69de29