From 80d0f8f4f34b4f22029fe96e1437aefceae22af0 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Wed, 25 Apr 2012 10:11:24 -0400 Subject: [PATCH] CC-3705: Dependecy for php-db removed, but still required by install script -fixed --- install_minimal/airtime-install | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/install_minimal/airtime-install b/install_minimal/airtime-install index 950712d88..f15e24b33 100755 --- a/install_minimal/airtime-install +++ b/install_minimal/airtime-install @@ -75,14 +75,10 @@ SCRIPT=`readlink -f $0` SCRIPTPATH=`dirname $SCRIPT` AIRTIMEROOT=$SCRIPTPATH/../ -#Check if required zend mvc and php-db libraries are present. This is a temporary workaround for 2.0.1, -#and we should probably create a seperate file that checks whether ALL dependencies are satisfied before +#Check if required zend mvc library is present. This is a temporary workaround for 2.0.1, +#and we should probably create a separate file that checks whether ALL dependencies are satisfied before #allowing the install to continue. However in that case, we wouldn't check for Debian packages so that we #can become less Debian platform dependent in the future... -set +e -dpkg -l | grep php-db > /dev/null 2>&1 -PHP_DB=$? - dpkg -l | grep zendframework > /dev/null 2>&1 ZENDFRAMEWORK=$? @@ -90,11 +86,6 @@ dpkg -l | grep libzend-framework-php > /dev/null 2>&1 LIBZEND=$? set -e -if [ "$PHP_DB" != "0" ]; then - echo "php-db package missing. Please run airtime-full-install" - exit 1 -fi - if [ "$ZENDFRAMEWORK" != "0" -a "$LIBZEND" != "0" ]; then echo "zendframework/libzend-framework-php package missing. Please run airtime-full-install" exit 1