From 71369545811d62c2e1510fb3f61b9e9b4cc30896 Mon Sep 17 00:00:00 2001 From: Sparkrai Date: Mon, 28 Oct 2024 00:25:07 -0400 Subject: [PATCH] Removed unused script --- files/scripts/packages.sh | 57 --------------------------------------- recipes/common_recipe.yml | 1 - 2 files changed, 58 deletions(-) delete mode 100644 files/scripts/packages.sh diff --git a/files/scripts/packages.sh b/files/scripts/packages.sh deleted file mode 100644 index b86db40..0000000 --- a/files/scripts/packages.sh +++ /dev/null @@ -1,57 +0,0 @@ -#!/usr/bin/bash - -set -ouex pipefail - -BLUEFIN_IMAGE_NAME=$([ "$BASE_IMAGE_NAME" == "bazzite-gnome" ] && echo "silverblue" || echo "kinoite") - -# build list of all packages requested for inclusion -INCLUDED_PACKAGES=($(jq -r "[(.all.include | (select(.all != null).all)[]), \ - (.all.include | (select(.\"$BASE_IMAGE_NAME\" != null).\"$BASE_IMAGE_NAME\")[]), \ - (.all.include | (select(.dx != null).dx)[]), \ - (select(.\"$FEDORA_MAJOR_VERSION\" != null).\"$FEDORA_MAJOR_VERSION\".include | (select(.all != null).all)[]), \ - (select(.\"$FEDORA_MAJOR_VERSION\" != null).\"$FEDORA_MAJOR_VERSION\".include | (select(.\"$BASE_IMAGE_NAME\" != null).\"$BASE_IMAGE_NAME\")[]), - (select(.\"$FEDORA_MAJOR_VERSION\" != null).\"$FEDORA_MAJOR_VERSION\".include | (select(.dx != null).dx)[])] \ - | sort | unique[]" ../bluefin/packages.json)) - -# build list of all packages requested for exclusion -EXCLUDED_PACKAGES=($(jq -r "[(.all.exclude | (select(.all != null).all)[]), \ - (.all.exclude | (select(.\"$BASE_IMAGE_NAME\" != null).\"$BASE_IMAGE_NAME\")[]), \ - (.all.exclude | (select(.dx != null).dx)[]), \ - (select(.\"$FEDORA_MAJOR_VERSION\" != null).\"$FEDORA_MAJOR_VERSION\".exclude | (select(.all != null).all)[]), \ - (select(.\"$FEDORA_MAJOR_VERSION\" != null).\"$FEDORA_MAJOR_VERSION\".exclude | (select(.\"$BASE_IMAGE_NAME\" != null).\"$BASE_IMAGE_NAME\")[]), - (select(.\"$FEDORA_MAJOR_VERSION\" != null).\"$FEDORA_MAJOR_VERSION\".exclude | (select(.dx != null).dx)[])] \ - | sort | unique[]" ../bluefin/packages.json)) - -# store a list of RPMs installed on the image -INSTALLED_EXCLUDED_PACKAGES=() - -# ensure exclusion list only contains packages already present on image -if [[ "${#EXCLUDED_PACKAGES[@]}" -gt 0 ]]; then - INSTALLED_EXCLUDED_PACKAGES=($(rpm -qa --queryformat='%{NAME} ' ${EXCLUDED_PACKAGES[@]})) -fi - -# simple case to install where no packages need excluding -if [[ "${#INCLUDED_PACKAGES[@]}" -gt 0 && "${#INSTALLED_EXCLUDED_PACKAGES[@]}" -eq 0 ]]; then - rpm-ostree install \ - ${INCLUDED_PACKAGES[@]} - -# install/excluded packages both at same time -elif [[ "${#INCLUDED_PACKAGES[@]}" -gt 0 && "${#INSTALLED_EXCLUDED_PACKAGES[@]}" -gt 0 ]]; then - rpm-ostree override remove \ - ${INSTALLED_EXCLUDED_PACKAGES[@]} \ - $(printf -- "--install=%s " ${INCLUDED_PACKAGES[@]}) -else - echo "No packages to install." -fi - -# check if any excluded packages are still present -# (this can happen if an included package pulls in a dependency) -if [[ "${#EXCLUDED_PACKAGES[@]}" -gt 0 ]]; then - INSTALLED_EXCLUDED_PACKAGES=($(rpm -qa --queryformat='%{NAME} ' ${EXCLUDED_PACKAGES[@]})) -fi - -# remove any excluded packages which are still present on image -if [[ "${#INSTALLED_EXCLUDED_PACKAGES[@]}" -gt 0 ]]; then - rpm-ostree override remove \ - ${INSTALLED_EXCLUDED_PACKAGES[@]} -fi diff --git a/recipes/common_recipe.yml b/recipes/common_recipe.yml index 0b73c6e..56c5a01 100755 --- a/recipes/common_recipe.yml +++ b/recipes/common_recipe.yml @@ -14,7 +14,6 @@ modules: - type: script scripts: - copr-repos.sh - # - packages.sh # Install packages from Bluefin and Bluefin DX - type: rpm-ostree