GUACAMOLE-1540: Merge correct automated retrieval of Docker build dep…

…endencies.
apache · Aug 19, 2022 · b2eb13a · b2eb13a
2 parents b5addfe + 2bc9d5f
commit b2eb13a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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
 
@@ -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