From 077e7243f264840cb71b801335cc9b728ee73813 Mon Sep 17 00:00:00 2001 From: Arcitec <38923130+Arcitec@users.noreply.github.com> Date: Wed, 10 May 2023 18:42:21 +0200 Subject: [PATCH] fix!: move recipe.yml to standardized location --- Containerfile | 2 +- build.sh | 2 +- etc/justfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Containerfile b/Containerfile index f6972d6..9d1b531 100644 --- a/Containerfile +++ b/Containerfile @@ -17,7 +17,7 @@ RUN mkdir /tmp/scripts COPY scripts /tmp/scripts RUN find /tmp/scripts -type f -exec chmod +x {} \; -COPY ${RECIPE} /usr/etc/ublue-recipe.yml +COPY ${RECIPE} /usr/share/ublue-os/recipe.yml # yq used in build.sh and the setup-flatpaks recipe to read the recipe.yml # copied from the official container image as it's not avaible as an rpm diff --git a/build.sh b/build.sh index 639b609..bf98d16 100644 --- a/build.sh +++ b/build.sh @@ -4,7 +4,7 @@ set -oue pipefail # Helper functions. -RECIPE_FILE="/usr/etc/ublue-recipe.yml" +RECIPE_FILE="/usr/share/ublue-os/recipe.yml" get_yaml_array() { mapfile -t "$1" < <(yq -- "$2" "$RECIPE_FILE") } diff --git a/etc/justfile b/etc/justfile index 5f760f0..c788ce0 100644 --- a/etc/justfile +++ b/etc/justfile @@ -26,7 +26,7 @@ distrobox-ubuntu: setup-flatpaks: #!/usr/bin/env bash echo 'Installing flatpaks from the ublue recipe ...' - flatpaks=$(yq '.flatpaks[]' < /usr/etc/ublue-recipe.yml) + flatpaks=$(yq '.flatpaks[]' < /usr/share/ublue-os/recipe.yml) for pkg in $flatpaks; do \ echo "Installing: ${pkg}" && \ flatpak install --user --noninteractive flathub $pkg; \