fix!: move recipe.yml to standardized location
This commit is contained in:
@@ -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
|
||||
|
||||
2
build.sh
2
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")
|
||||
}
|
||||
|
||||
@@ -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; \
|
||||
|
||||
Reference in New Issue
Block a user