From 5918cc9f7c52971c0a1d79c3e496aae56786b41b Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Fri, 19 Aug 2022 12:11:29 -0700 Subject: [PATCH 1/2] GUACAMOLE-1540: Ignore failures to find packages associated with libraries we build ourselves. --- src/guacd-docker/bin/list-dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/guacd-docker/bin/list-dependencies.sh b/src/guacd-docker/bin/list-dependencies.sh index 3055be46..aa36d1f0 100755 --- a/src/guacd-docker/bin/list-dependencies.sh +++ b/src/guacd-docker/bin/list-dependencies.sh @@ -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 From 2bc9d5ff01b0267618c72e3dbaa32c9ebea36d6a Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Fri, 19 Aug 2022 12:12:07 -0700 Subject: [PATCH 2/2] GUACAMOLE-1540: Correct regex stripping of package version (major number may have multiple digits). --- src/guacd-docker/bin/list-dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/guacd-docker/bin/list-dependencies.sh b/src/guacd-docker/bin/list-dependencies.sh index aa36d1f0..98319fba 100755 --- a/src/guacd-docker/bin/list-dependencies.sh +++ b/src/guacd-docker/bin/list-dependencies.sh @@ -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