Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More install dependency fixes

This commit is contained in:
Duncan Sommerville 2015-03-11 17:10:34 -04:00
parent 405037e3ec
commit 3782817819
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
install
View File

@ -287,8 +287,9 @@ echo "\____|__ /___||____|_ / |____| |___\____|__ /_______ / "
echo -e " \/ \/ \/ \/ \n" echo -e " \/ \/ \/ \/ \n"
if [ "$ignore_dependencies" = "f" ]; then if [ "$ignore_dependencies" = "f" ]; then
set +e
if [ -z "${dist}" ]; then 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);}'` dist=`lsb_release -ds | awk '{print tolower($1);}'`
code=`lsb_release -cs` code=`lsb_release -cs`
fi fi
@ -298,7 +299,6 @@ if [ "$ignore_dependencies" = "f" ]; then
loud "-----------------------------------------------------" loud "-----------------------------------------------------"
verbose "\n * Reading requirements-${dist,,}-${code,,}.apt..." verbose "\n * Reading requirements-${dist,,}-${code,,}.apt..."
set +e
loudCmd "apt-get update" loudCmd "apt-get update"
if [ -f ${SCRIPT_DIR}/installer/lib/requirements-${dist,,}-${code,,}.apt ]; then 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' ' ')" loudCmd "DEBIAN_FRONTEND=noninteractive apt-get -y -m --force-yes install $(grep -vE '^\s*#' ${SCRIPT_DIR}/installer/lib/requirements-${dist,,}-${code,,}.apt | tr '\n' ' ')"

5
installer/lib/requirements-ubuntu-saucy.apt
View File

@ -66,7 +66,4 @@ liquidsoap-plugin-voaacenc
liquidsoap-plugin-vorbis liquidsoap-plugin-vorbis
silan silan
libopus0 libopus0
sysv-init
sysvinit-utils