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

Merge branch 'main' into rpm-ostree-local-repo-rpm

Browse source
This commit is contained in:
fiftydinar 2024-08-01 09:42:55 +02:00 • committed by GitHub
commit 155cad29f1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
modules/bling/installers/ublue-update.sh
View file

@ -27,17 +27,12 @@ if [[ -f "$RPM_OSTREE_CONFIG" ]]; then
fi fi
systemctl disable rpm-ostreed-automatic.timer systemctl disable rpm-ostreed-automatic.timer
# Install python3-pip if it's not already installed
if ! rpm -q python3-pip > /dev/null; then
rpm-ostree install python3-pip
fi
# Fetch ublue COPR # Fetch ublue COPR
REPO="https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-${OS_VERSION}/ublue-os-staging-fedora-${OS_VERSION}.repo" REPO="https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-${OS_VERSION}/ublue-os-staging-fedora-${OS_VERSION}.repo"
wget "${REPO//[$'\t\r\n ']}" -P "/etc/yum.repos.d/" wget "${REPO//[$'\t\r\n ']}" -P "/etc/yum.repos.d/"
# topgrade is REQUIRED by ublue-update to install # topgrade is REQUIRED by ublue-update to install
pip install --prefix=/usr topgrade rpm-ostree install topgrade
rpm-ostree install ublue-update rpm-ostree install ublue-update
# Remove ublue COPR # Remove ublue COPR

11
modules/yafti/yafti.sh
View file

@ -17,11 +17,14 @@ 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"
echo "Installing python3-pip and libadwaita" # Fetch ublue COPR
rpm-ostree install python3-pip libadwaita REPO="https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-${OS_VERSION}/ublue-os-staging-fedora-${OS_VERSION}.repo"
wget -O "/etc/yum.repos.d/ublue-os-staging-fedora-${OS_VERSION}.repo" "${REPO//[$'\t\r\n ']}"
echo "Installing and enabling yafti" rpm-ostree install yafti-0.8.0
pip install --prefix=/usr yafti==0.8.0
# Remove ublue COPR
rm /etc/yum.repos.d/ublue-os-staging-fedora-*.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