Skip to content
This repository has been archived by the owner on Oct 18, 2024. It is now read-only.

Commit

Permalink
fix: removed issues in rpm-ostree module and ublue-update bling insta…
Browse files Browse the repository at this point in the history
…ller (#144)

* fix(rpm-ostree): format string in optfix
This fixes optfix and makes the symlink not broken

* fix: change rpm-ostreed auto update policy in ublue-update installer
  • Loading branch information
gerblesh authored Sep 8, 2023
1 parent 8f76fd6 commit 3f2ef28
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 2 deletions.
12 changes: 11 additions & 1 deletion modules/bling/installers/ublue-update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,14 @@ set -oue pipefail
if rpm -q ublue-os-update-services > /dev/null; then
rpm-ostree override remove ublue-os-update-services
fi
rpm-ostree install "$BLING_DIRECTORY"/rpms/ublue-update*.rpm

# Change the conflicting update policy for rpm-ostreed
RPM_OSTREE_CONFIG="/usr/etc/rpm-ostreed.conf"

if [[ -f $RPM_OSTREE_CONFIG ]]; then
if [[ "$(get_config_value AutomaticUpdatePolicy $RPM_OSTREE_CONFIG)" == "stage" ]]; then
set_config_value AutomaticUpdatePolicy none $RPM_OSTREE_CONFIG
fi
fi

rpm-ostree install "$BLING_DIRECTORY"/rpms/ublue-update*.rpm
3 changes: 2 additions & 1 deletion modules/rpm-ostree/rpm-ostree.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ if [[ ${#OPTFIX[@]} -gt 0 ]]; then
for OPTPKG in "${OPTFIX[@]}"; do
OPTPKG="${OPTPKG%\"}"
OPTPKG="${OPTPKG#\"}"
OPTPKG=$(printf "$OPTPKG")
mkdir -p "/usr/lib/opt/${OPTPKG}"
ln -s "../../usr/lib/opt/${OPTPKG}" "/var/opt/${OPTPKG}"
echo "Created symlinks for ${OPTPKG}"
Expand Down Expand Up @@ -54,4 +55,4 @@ elif [[ ${#INSTALL[@]} -gt 0 ]]; then
echo "Removing RPMs"
echo "Removing: ${REMOVE_STR[*]}"
rpm-ostree override remove ${REMOVE_STR[@]}
fi
fi

0 comments on commit 3f2ef28

Please sign in to comment.