GUACAMOLE-1540: Merge correct automated retrieval of Docker build dependencies.

This commit is contained in:
Virtually Nick 2022-08-19 15:30:31 -04:00 committed by GitHub
commit b2eb13a178
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -37,7 +37,7 @@ while [ -n "$1" ]; do
# List the package providing that library, if any
apk info -W "$LIBRARY" 2> /dev/null \
| grep 'is owned by' | grep -o '[^ ]*$'
| grep 'is owned by' | grep -o '[^ ]*$' || true
done
@ -47,5 +47,5 @@ while [ -n "$1" ]; do
# Strip the "-VERSION" suffix from each package name, listing each resulting
# package uniquely ("apk add" cannot handle package names that include the
# version number)
done | sed 's/\(.*\)-[0-9]\..*$/\1/' | sort -u
done | sed 's/\(.*\)-[0-9]\+\..*$/\1/' | sort -u