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

fix(rpm-ostree): Installing local packages

Browse source 
I forgot to append prefix

${CONFIG_DIRECTORY}/rpm-ostree/

to them
This commit is contained in:
fiftydinar 2024-07-31 18:53:23 +02:00
parent 50c9c15c80
commit b05f4e85ff
1 changed files with 21 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -47,6 +47,10 @@ fi
get_yaml_array INSTALL '.install[]' "$1" get_yaml_array INSTALL '.install[]' "$1"
get_yaml_array REMOVE '.remove[]' "$1" get_yaml_array REMOVE '.remove[]' "$1"
CLASSIC_INSTALL=false
HTTPS_INSTALL=false
LOCAL_INSTALL=false
# Install and remove RPM packages # Install and remove RPM packages
# Sort classic, URL & local packages # Sort classic, URL & local packages
if [[ ${#INSTALL[@]} -gt 0 ]]; then if [[ ${#INSTALL[@]} -gt 0 ]]; then
@ -57,7 +61,7 @@ if [[ ${#INSTALL[@]} -gt 0 ]]; then
HTTPS_PKG+=("${VERSION_SUBSTITUTED_PKG}") HTTPS_PKG+=("${VERSION_SUBSTITUTED_PKG}")
elif [[ ! "$PKG" =~ ^https?:\/\/.* ]] && [[ -f "${CONFIG_DIRECTORY}/rpm-ostree/${PKG}" ]]; then elif [[ ! "$PKG" =~ ^https?:\/\/.* ]] && [[ -f "${CONFIG_DIRECTORY}/rpm-ostree/${PKG}" ]]; then
LOCAL_INSTALL=true LOCAL_INSTALL=true
LOCAL_PKG+=("${PKG}") LOCAL_PKG+=("${CONFIG_DIRECTORY}/rpm-ostree/${PKG}")
else else
CLASSIC_INSTALL=true CLASSIC_INSTALL=true
CLASSIC_PKG+=("${PKG}") CLASSIC_PKG+=("${PKG}")
@ -67,7 +71,22 @@ done
# The installation is done with some wordsplitting hacks # The installation is done with some wordsplitting hacks
# because of errors when doing array destructuring at the installation step. # because of errors when doing array destructuring at the installation step.
# This is different from other ublue projects and could be investigated further. # This is different from other ublue projects and could be investigated further.
INSTALL_STR=$(echo "${INSTALL[*]}" | tr -d '\n') if ${CLASSIC_INSTALL} && ! ${HTTPS_INSTALL} && ! ${LOCAL_INSTALL}; then
INSTALL_STR=$(echo "${CLASSIC_PKG[*]}" | tr -d '\n')
elif ! ${CLASSIC_INSTALL} && ${HTTPS_INSTALL} && ! ${LOCAL_INSTALL}; then
INSTALL_STR=$(echo "${HTTPS_PKG[*]}" | tr -d '\n')
elif ! ${CLASSIC_INSTALL} && ! ${HTTPS_INSTALL} && ${LOCAL_INSTALL}; then
INSTALL_STR=$(echo "${LOCAL_PKG[*]}" | tr -d '\n')
elif ${CLASSIC_INSTALL} && ${HTTPS_INSTALL} && ! ${LOCAL_INSTALL}; then
INSTALL_STR=$(echo "${CLASSIC_PKG[*]}" "${HTTPS_PKG[*]}" | tr -d '\n')
elif ${CLASSIC_INSTALL} && ! ${HTTPS_INSTALL} && ${LOCAL_INSTALL}; then
INSTALL_STR=$(echo "${CLASSIC_PKG[*]}" "${LOCAL_PKG[*]}" | tr -d '\n')
elif ! ${CLASSIC_INSTALL} && ${HTTPS_INSTALL} && ${LOCAL_INSTALL}; then
INSTALL_STR=$(echo "${HTTPS_PKG[*]}" "${LOCAL_PKG[*]}" | tr -d '\n')
elif ${CLASSIC_INSTALL} && ${HTTPS_INSTALL} && ${LOCAL_INSTALL}; then
INSTALL_STR=$(echo "${CLASSIC_PKG[*]}" "${HTTPS_PKG[*]}" "${LOCAL_PKG[*]}" | tr -d '\n')
fi
REMOVE_STR=$(echo "${REMOVE[*]}" | tr -d '\n') REMOVE_STR=$(echo "${REMOVE[*]}" | tr -d '\n')
echo_rpm_install() { echo_rpm_install() {