RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 08:07:34 +00:00
Code Issues Activity Actions

Ports: Install all dependencies instead of just one

Browse source 
Commit 9b7e217dda broke installation of port dependencies by
`return`ing as soon as the first dependency was found.
This commit is contained in:
Jelle Raaijmakers 2023-02-01 22:05:40 +01:00 • committed by Andreas Kling
parent 62f4486190
commit 403c0e6dab
1 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Ports/.port_include.sh
View file

@ -527,19 +527,21 @@ package_install_state() {
} }
installdepends() { installdepends() {
for depend in "${depends[@]}"; do for depend in "${depends[@]}"; do
if [ -z "$(package_install_state $depend)" ]; then if [ -n "$(package_install_state $depend)" ]; then
# Split colon seperated string into a list continue
IFS=':' read -ra port_directories <<< "$SERENITY_PORT_DIRS"
for port_dir in "${port_directories[@]}"; do
if [ -d "${port_dir}/$depend" ]; then
(cd "${port_dir}/$depend" && ./package.sh --auto)
return
fi
done
>&2 echo "Error: Dependency $depend could not be found."
exit 1
fi fi
# Split colon separated string into a list
IFS=':' read -ra port_directories <<< "$SERENITY_PORT_DIRS"
for port_dir in "${port_directories[@]}"; do
if [ -d "${port_dir}/$depend" ]; then
(cd "${port_dir}/$depend" && ./package.sh --auto)
continue 2
fi
done
>&2 echo "Error: Dependency $depend could not be found."
exit 1
done done
} }
uninstall() { uninstall() {