Merge branch 'main' into rpm-ostree-local-repo-rpm
This commit is contained in:
commit
155cad29f1
2 changed files with 8 additions and 10 deletions
|
|
@ -27,17 +27,12 @@ if [[ -f "$RPM_OSTREE_CONFIG" ]]; then
|
|||
fi
|
||||
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
|
||||
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/"
|
||||
|
||||
# topgrade is REQUIRED by ublue-update to install
|
||||
pip install --prefix=/usr topgrade
|
||||
rpm-ostree install topgrade
|
||||
rpm-ostree install ublue-update
|
||||
|
||||
# Remove ublue COPR
|
||||
|
|
|
|||
|
|
@ -17,11 +17,14 @@ FIRSTBOOT_SCRIPT="${FIRSTBOOT_DATA}/launcher/login-profile.sh"
|
|||
PROFILED_DIR="/usr/etc/profile.d"
|
||||
FIRSTBOOT_LINK="${PROFILED_DIR}/ublue-firstboot.sh"
|
||||
|
||||
echo "Installing python3-pip and libadwaita"
|
||||
rpm-ostree install python3-pip libadwaita
|
||||
# Fetch ublue COPR
|
||||
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"
|
||||
pip install --prefix=/usr yafti==0.8.0
|
||||
rpm-ostree install 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 [ ! -d "${PROFILED_DIR}" ]; then
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue