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

fix(yafti): Revert to pip installation method (#308)

Browse source
This commit is contained in:
fiftydinar 2024-08-01 19:11:31 +02:00 • committed by GitHub
commit eccb99fa97
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

20
modules/yafti/yafti.sh
View file

@ -17,23 +17,11 @@ FIRSTBOOT_SCRIPT="${FIRSTBOOT_DATA}/launcher/login-profile.sh"
PROFILED_DIR="/usr/etc/profile.d" PROFILED_DIR="/usr/etc/profile.d"
FIRSTBOOT_LINK="${PROFILED_DIR}/ublue-firstboot.sh" FIRSTBOOT_LINK="${PROFILED_DIR}/ublue-firstboot.sh"
# Fetch ublue COPR echo "Installing python3-pip and libadwaita"
REPO="https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-${OS_VERSION}/ublue-os-staging-fedora-${OS_VERSION}.repo" rpm-ostree install python3-pip libadwaita
wget -O "/etc/yum.repos.d/ublue-os-staging-fedora-${OS_VERSION}.repo" "${REPO//[$'\t\r\n ']}"
# Increase repo priority, since downstream Ublue images like Bluefin/Aurora & Bazzite can explicitly disable this repo in another .repo file
echo "priority=90" >> "/etc/yum.repos.d/ublue-os-staging-fedora-${OS_VERSION}.repo"
# Remove system python3-pydantic package if it's already installed, so yafti's older version is installed instead echo "Installing and enabling yafti"
if rpm -q python3-pydantic >/dev/null; then pip install --prefix=/usr yafti==0.8.0
rpm-ostree uninstall python3-pydantic
fi
# Install yafti RPM to fixed version, since refactored yafti should come after this version
# We don't want to surprise users with that
rpm-ostree install yafti-0.8.0
# Remove ublue-staging COPR
rm "/etc/yum.repos.d/ublue-os-staging-fedora-${OS_VERSION}.repo"
# If the profile.d directory doesn't exist, create it # If the profile.d directory doesn't exist, create it
if [ ! -d "${PROFILED_DIR}" ]; then if [ ! -d "${PROFILED_DIR}" ]; then