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

fix(rpm-ostree): Installation of local & URL packages when --install= flag is used

Browse source
This commit is contained in:
fiftydinar 2024-07-31 21:33:19 +02:00
parent 93ff0d9eb9
commit fb468ba703
1 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

22
modules/rpm-ostree/rpm-ostree.sh
View file

@ -118,7 +118,27 @@ if [[ ${#INSTALL[@]} -gt 0 && ${#REMOVE[@]} -gt 0 ]]; then
echo_rpm_install
echo "Removing: ${REMOVE_STR[*]}"
# Doing both actions in one command allows for replacing required packages with alternatives
rpm-ostree override remove $REMOVE_STR $(printf -- "--install=%s " $INSTALL_STR)
# When --install= flag is used, URLs & local packages are not supported
if ${CLASSIC_INSTALL} && ! ${HTTPS_INSTALL} && ! ${LOCAL_INSTALL}; then
CLASSIC_PKGS=$(echo "${CLASSIC_PKG[*]}" | tr -d '\n')
rpm-ostree override remove $REMOVE_STR $(printf -- "--install=%s " $CLASSIC_PKGS)
elif ${CLASSIC_INSTALL} && ${HTTPS_INSTALL} && ! ${LOCAL_INSTALL}; then
CLASSIC_PKGS=$(echo "${CLASSIC_PKG[*]}" | tr -d '\n')
HTTPS_PKGS=$(echo "${HTTPS_PKG[*]}" | tr -d '\n')
rpm-ostree override remove $REMOVE_STR $(printf -- "--install=%s " $CLASSIC_PKGS)
rpm-ostree install $HTTPS_PKGS
elif ${CLASSIC_INSTALL} && ! ${HTTPS_INSTALL} && ! ${LOCAL_INSTALL}; then
CLASSIC_PKGS=$(echo "${CLASSIC_PKG[*]}" | tr -d '\n')
LOCAL_PKGS=$(echo "${LOCAL_PKG[*]}" | tr -d '\n')
rpm-ostree override remove $REMOVE_STR $(printf -- "--install=%s " $CLASSIC_PKGS)
rpm-ostree install $LOCAL_PKGS
elif ${CLASSIC_INSTALL} && ${HTTPS_INSTALL} && ${LOCAL_INSTALL}; then
CLASSIC_PKGS=$(echo "${CLASSIC_PKG[*]}" | tr -d '\n')
HTTPS_PKGS=$(echo "${HTTPS_PKG[*]}" | tr -d '\n')
LOCAL_PKGS=$(echo "${LOCAL_PKG[*]}" | tr -d '\n')
rpm-ostree override remove $REMOVE_STR $(printf -- "--install=%s " $CLASSIC_PKGS)
rpm-ostree install $HTTPS_PKGS $LOCAL_PKGS
fi
elif [[ ${#INSTALL[@]} -gt 0 ]]; then
echo "Installing RPMs"
echo_rpm_install