Enhance dependency checking

Allow multiple files containing dependencies to be specified. The
core base dependency list will always be included. This may be useful
for examples that require additional packages compared to the core
dependencies.

Use dpkg as an additional test to decide if a pkg needs to be
installed. Packages that provide only libraries fail the hash test
regardless of whether they are installed or not, so they need to be
checked via other means. For example libavcodec-dev.

A failure to install or check deps must exit with error.

Author: learmj

build.sh

@@ -6,7 +6,7 @@ IGTOP=$(readlink -f "$(dirname "$0")")
 
 source "${IGTOP}/scripts/common"
 source "${IGTOP}/scripts/dependencies_check"
-dependencies_check "${IGTOP}/depends"
+dependencies_check "${IGTOP}/depends" || exit 1
 
 
 usage()

install_deps.sh

@@ -1,5 +1,11 @@
 #!/bin/bash
 
+set -eu
+
 IGTOP=$(readlink -f "$(dirname "$0")")
 source "${IGTOP}/scripts/dependencies_check"
-dependencies_install "${IGTOP}/depends"
+depf=("${IGTOP}/depends")
+for f in "$@" ; do
+   depf+=($(realpath -e "$f"))
+done
+dependencies_install "${depf[@]}"

scripts/dependencies_check

@@ -14,12 +14,13 @@ dependencies_check()
 
 	for depfile in "$@"; do
 		if [[ -e "$depfile" ]]; then
-			deps="$(sed -f "${IGTOP}/scripts/remove-comments.sed" < "${IGTOP}/depends")"
-
+			deps="$(sed -f "${IGTOP}/scripts/remove-comments.sed" < "$depfile")"
 		fi
 		for dep in $deps; do
 			if ! hash "${dep%:*}" 2>/dev/null; then
-				missing+=("${dep#*:}")
+				if ! dpkg -s "${dep#*:}" > /dev/null 2>&1; then
+					missing+=("${dep#*:}")
+				fi
 			fi
 		done
 	done
@@ -32,10 +33,11 @@ dependencies_check()
 		echo
 		echo "Script install_deps.sh can be used for this purpose."
 		echo
-		false
 
 		if [[ "$op" == install ]] ; then
 			apt install -y "${missing[@]}"
+		else
+			exit 1
 		fi
 	fi