summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/scripts/install_prereq9
1 files changed, 4 insertions, 5 deletions
diff --git a/contrib/scripts/install_prereq b/contrib/scripts/install_prereq
index afad1f719..1682558ac 100755
--- a/contrib/scripts/install_prereq
+++ b/contrib/scripts/install_prereq
@@ -66,13 +66,12 @@ in_test_mode() {
}
check_installed_debs() {
- for pack in "$@"
- do
- tocheck="${tocheck} ^${pack}$"
+ for pack in "$@" ; do
+ tocheck="${tocheck} ^${pack}$ ~P^${pack}$"
done
pkgs=$(aptitude -F '%c %p' search ${tocheck} 2>/dev/null | awk '/^p/{print $2}')
- if ! [ ${#pkgs} -eq 0 ]; then
- echo $pkgs | grep -v ':i386$'
+ if [ ${#pkgs} -ne 0 ]; then
+ echo $pkgs | sed -r -e "s/ ?[^ :]+:i386//g"
fi
}