From 3782817819889b650d960a420b9b7df6b5478b77 Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Wed, 11 Mar 2015 17:10:34 -0400 Subject: [PATCH] More install dependency fixes --- install | 4 ++-- installer/lib/requirements-ubuntu-saucy.apt | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/install b/install index 338484e9a..991f5050f 100755 --- a/install +++ b/install @@ -287,8 +287,9 @@ echo "\____|__ /___||____|_ / |____| |___\____|__ /_______ / " echo -e " \/ \/ \/ \/ \n" if [ "$ignore_dependencies" = "f" ]; then + set +e if [ -z "${dist}" ]; then - loudCmd "apt-get install lsb-release" + loudCmd "apt-get -y --force-yes install lsb-release" dist=`lsb_release -ds | awk '{print tolower($1);}'` code=`lsb_release -cs` fi @@ -298,7 +299,6 @@ if [ "$ignore_dependencies" = "f" ]; then loud "-----------------------------------------------------" verbose "\n * Reading requirements-${dist,,}-${code,,}.apt..." - set +e loudCmd "apt-get update" if [ -f ${SCRIPT_DIR}/installer/lib/requirements-${dist,,}-${code,,}.apt ]; then loudCmd "DEBIAN_FRONTEND=noninteractive apt-get -y -m --force-yes install $(grep -vE '^\s*#' ${SCRIPT_DIR}/installer/lib/requirements-${dist,,}-${code,,}.apt | tr '\n' ' ')" diff --git a/installer/lib/requirements-ubuntu-saucy.apt b/installer/lib/requirements-ubuntu-saucy.apt index 2d513bf95..5d410413d 100644 --- a/installer/lib/requirements-ubuntu-saucy.apt +++ b/installer/lib/requirements-ubuntu-saucy.apt @@ -66,7 +66,4 @@ liquidsoap-plugin-voaacenc liquidsoap-plugin-vorbis silan -libopus0 - -sysv-init -sysvinit-utils \ No newline at end of file +libopus0 \ No newline at end of file