Skip to content
This repository has been archived by the owner on Oct 18, 2024. It is now read-only.

Commit

Permalink
fix!: move recipe.yml to standardized location
Browse files Browse the repository at this point in the history
  • Loading branch information
Arcitec authored and xynydev committed May 10, 2023
1 parent 6ecd35b commit 077e724
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Expand Down
2 changes: 1 addition & 1 deletion etc/justfile
Original file line number Diff line number Diff line change
Expand Up @@ -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; \
Expand Down

0 comments on commit 077e724

Please sign in to comment.