diff --git a/install_full/ubuntu/airtime-full-install b/install_full/ubuntu/airtime-full-install index d70429d6d..af135b124 100755 --- a/install_full/ubuntu/airtime-full-install +++ b/install_full/ubuntu/airtime-full-install @@ -23,6 +23,7 @@ echo " 1. Install Packages" echo "----------------------------------------------------" dist=`lsb_release -is` +code=`lsb_release -cs` if [ "$dist" = "Debian" ]; then set +e @@ -51,8 +52,7 @@ php-pear php5-gd postgresql odbc-postgresql python libsoundtouch-ocaml \ libtaglib-ocaml libao-ocaml libmad-ocaml ecasound \ libesd0 libportaudio2 libsamplerate0 rabbitmq-server patch \ php5-curl mpg123 monit python-virtualenv multitail libcamomile-ocaml-data \ -libpulse0 vorbis-tools lsb-release lsof sudo mp3gain vorbisgain flac vorbis-tools \ -timeout +libpulse0 vorbis-tools lsb-release lsof sudo mp3gain vorbisgain flac vorbis-tools #install packages with --force-yes option (this is useful in the case #of Debian, where these packages are unauthorized) @@ -68,6 +68,13 @@ else apt-get -y install libzend-framework-php fi +if [ "$code" = "lucid" ]; then + apt-get -y install timeout +else + apt-get -y install coreutils +fi + + #Install Sourcefabric's custom Liquidsoap debian package apt-get -y --force-yes install sourcefabric-keyring apt-get -y --force-yes install liquidsoap diff --git a/install_full/ubuntu/airtime-full-install-nginx b/install_full/ubuntu/airtime-full-install-nginx index 0f6abf950..c89e81198 100755 --- a/install_full/ubuntu/airtime-full-install-nginx +++ b/install_full/ubuntu/airtime-full-install-nginx @@ -26,11 +26,12 @@ echo " 1. Install Packages" echo "----------------------------------------------------" dist=`lsb_release -is` +code=`lsb_release -cs` if [ "$dist" -eq "Debian" ]; then - grep "deb http://www.debian-multimedia.org squeeze main non-free" /etc/apt/sources.list + grep "deb http://www.deb-multimedia.org squeeze main non-free" /etc/apt/sources.list if [ "$?" -ne "0" ]; then - echo "deb http://www.debian-multimedia.org squeeze main non-free" >> /etc/apt/sources.list + echo "deb http://www.deb-multimedia.org squeeze main non-free" >> /etc/apt/sources.list fi fi @@ -42,8 +43,7 @@ php-pear php5-gd postgresql odbc-postgresql python libsoundtouch-ocaml \ libtaglib-ocaml libao-ocaml libmad-ocaml ecasound \ libesd0 libportaudio2 libsamplerate0 rabbitmq-server patch \ php5-curl mpg123 monit python-virtualenv multitail libcamomile-ocaml-data \ -libpulse0 vorbis-tools lsb-release lsof sudo mp3gain vorbisgain flac vorbis-tools \ -timeout +libpulse0 vorbis-tools lsb-release lsof sudo mp3gain vorbisgain flac vorbis-tools #install packages with --force-yes option (this is useful in the case #of Debian, where these packages are unauthorized) @@ -58,6 +58,12 @@ else apt-get -y install libzend-framework-php fi +if [ "$code" = "lucid" ]; then + apt-get -y install timeout +else + apt-get -y install coreutils +fi + # NGINX Config File echo "----------------------------------------------------" echo "2.1 NGINX Config File"