From 5c11895dd745ce8a0b9b07b176210f430ac8b1f0 Mon Sep 17 00:00:00 2001
From: Adam Daniels <adam@mediadrive.ca>
Date: Sat, 23 Feb 2013 11:20:14 -0500
Subject: [PATCH] Fix commands for apt package manager.

Force yes when performing apt-get install. Even though we provide
noninteractive, apt still prompts in some situations.

Grep dpkg-query when checking if package is installed. In some cases,
dpkg -l will exit 0 if the package exists, but is not in an installed
state.
---
 helpers/default | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/helpers/default b/helpers/default
index bb25e5e..f705a07 100644
--- a/helpers/default
+++ b/helpers/default
@@ -163,7 +163,7 @@ package () {
   fi
 
   if [ "$PACKAGE_MANAGER" == 'apt-get' ]; then
-    DEBIAN_FRONTEND=noninteractive apt-get install -y $1
+    DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes $1
   elif [ "$PACKAGE_MANAGER" == 'yum' ]; then
     yum install -y $1
   elif [ "$PACKAGE_MANAGER" == 'brew' ]; then
@@ -193,7 +193,7 @@ test_package_installed () {
   fi
 
   if [ "$PACKAGE_MANAGER" == 'apt-get' ]; then
-    dpkg -l $1
+    dpkg-query -l "$1" | grep -q ^.i
     return $?
   fi