particle-os/particle-os-modules
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: Switch from using rpm-ostree to using dnf5 in some modules

Browse source
This commit is contained in:
fiftydinar 2025-03-07 01:43:22 +01:00 • committed by GitHub
parent 932a9b5bf1
commit 1c52771e2b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 29 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

20
modules/akmods/akmods.sh
View file

@ -7,10 +7,16 @@ ENABLE_AKMODS_REPO() {
INSTALL_RPM_FUSION() { INSTALL_RPM_FUSION() {
if ! rpm -q rpmfusion-free-release &>/dev/null && ! rpm -q rpmfusion-nonfree-release &>/dev/null; then if ! rpm -q rpmfusion-free-release &>/dev/null && ! rpm -q rpmfusion-nonfree-release &>/dev/null; then
rpm-ostree install \ if command -v dnf5 &> /dev/null; then
https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-${OS_VERSION}.noarch.rpm \ dnf5 -y install \
https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-${OS_VERSION}.noarch.rpm https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-${OS_VERSION}.noarch.rpm \
previously_not_installed_rpm_fusion=true https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-${OS_VERSION}.noarch.rpm
elif command -v rpm-ostree &> /dev/null; then
rpm-ostree install \
https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-${OS_VERSION}.noarch.rpm \
https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-${OS_VERSION}.noarch.rpm
fi
previously_not_installed_rpm_fusion=true
else else
previously_not_installed_rpm_fusion=false previously_not_installed_rpm_fusion=false
fi fi
@ -18,7 +24,11 @@ fi
UNINSTALL_RPM_FUSION() { UNINSTALL_RPM_FUSION() {
if "${previously_not_installed_rpm_fusion}"; then if "${previously_not_installed_rpm_fusion}"; then
rpm-ostree uninstall rpmfusion-free-release rpmfusion-nonfree-release if command -v dnf5 &> /dev/null; then
dnf5 -y remove rpmfusion-free-release rpmfusion-nonfree-release
elif command -v rpm-ostree &> /dev/null; then
rpm-ostree uninstall rpmfusion-free-release rpmfusion-nonfree-release
fi
fi fi
} }

15
modules/brew/brew.sh
View file

@ -11,15 +11,18 @@ fi
# Check if gcc is installed & install it if it's not # Check if gcc is installed & install it if it's not
# (add VanillaOS package manager in the future when it gets supported) # (add VanillaOS package manager in the future when it gets supported)
if ! command -v gcc &> /dev/null; then if ! command -v gcc &> /dev/null; then
if command -v rpm-ostree &> /dev/null; then if command -v dnf5 &> /dev/null; then
echo "Installing \"gcc\" package, which is necessary for Brew to function"
dnf5 -y install gcc
elif command -v rpm-ostree &> /dev/null; then
echo "Installing \"gcc\" package, which is necessary for Brew to function" echo "Installing \"gcc\" package, which is necessary for Brew to function"
rpm-ostree install gcc rpm-ostree install gcc
else
echo "ERROR: \"gcc\" package could not be found"
echo " Brew depends on \"gcc\" in order to function"
echo " Please include \"gcc\" in the list of packages to install with the system package manager"
exit 1
fi fi
else
echo "ERROR: \"gcc\" package could not be found"
echo " Brew depends on \"gcc\" in order to function"
echo " Please include \"gcc\" in the list of packages to install with the system package manager"
exit 1
fi fi
# Check if zstd is installed & install it if it's not # Check if zstd is installed & install it if it's not

6
modules/yafti/yafti.sh
View file

@ -31,7 +31,11 @@ echo "Downloading repo file ${REPO_URL}"
curl -fLs --create-dirs "${REPO_URL}" -o "${STAGING_REPO_PATH}" curl -fLs --create-dirs "${REPO_URL}" -o "${STAGING_REPO_PATH}"
echo "Downloaded repo file ${REPO_URL}" echo "Downloaded repo file ${REPO_URL}"
rpm-ostree install libadwaita yafti if command -v dnf5 &> /dev/null; then
dnf5 -y install libadwaita yafti
elif command -v rpm-ostree &> /dev/null; then
rpm-ostree install libadwaita yafti
fi
# Remove ublue COPR # Remove ublue COPR
rm /etc/yum.repos.d/ublue-os-staging-fedora-*.repo rm /etc/yum.repos.d/ublue-os-staging-fedora-*.repo