wunker-bunker/wunker-os
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix!: move recipe.yml to standardized location

Browse Source
This commit is contained in:
Arcitec
2023-05-10 18:42:21 +02:00
committed by Eino Rauhala
parent 6ecd35bc91
commit 077e7243f2
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Containerfile
View File

@@ -17,7 +17,7 @@ RUN mkdir /tmp/scripts
COPY scripts /tmp/scripts COPY scripts /tmp/scripts
RUN find /tmp/scripts -type f -exec chmod +x {} \; 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 # 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 # copied from the official container image as it's not avaible as an rpm

2
build.sh
View File

@@ -4,7 +4,7 @@
set -oue pipefail set -oue pipefail
# Helper functions. # Helper functions.
RECIPE_FILE="/usr/etc/ublue-recipe.yml" RECIPE_FILE="/usr/share/ublue-os/recipe.yml"
get_yaml_array() { get_yaml_array() {
mapfile -t "$1" < <(yq -- "$2" "$RECIPE_FILE") mapfile -t "$1" < <(yq -- "$2" "$RECIPE_FILE")
} }

2
etc/justfile
View File

@@ -26,7 +26,7 @@ distrobox-ubuntu:
setup-flatpaks: setup-flatpaks:
#!/usr/bin/env bash #!/usr/bin/env bash
echo 'Installing flatpaks from the ublue recipe ...' 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 \ for pkg in $flatpaks; do \
echo "Installing: ${pkg}" && \ echo "Installing: ${pkg}" && \
flatpak install --user --noninteractive flathub $pkg; \ flatpak install --user --noninteractive flathub $pkg; \