From c399a4ad0a59611dad864cf18a0235b72e68e0d0 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Wed, 30 Nov 2011 11:41:10 -0500 Subject: [PATCH] CC-3145: create debian full install -done --- dev_tools/fabric/fab_release_test.py | 14 +++++++------- install_full/debian/airtime-full-install | 14 ++++++++++++++ install_full/ubuntu/airtime-full-install | 9 +++++++++ 3 files changed, 30 insertions(+), 7 deletions(-) create mode 100755 install_full/debian/airtime-full-install diff --git a/dev_tools/fabric/fab_release_test.py b/dev_tools/fabric/fab_release_test.py index 9210b142f..6145a5733 100644 --- a/dev_tools/fabric/fab_release_test.py +++ b/dev_tools/fabric/fab_release_test.py @@ -143,8 +143,8 @@ def create_fresh_os(vm_name, lucid=False, debian=False): #installed before. do_sudo('echo "rabbitmq-server rabbitmq-server/upgrade_previous note" | debconf-set-selections') - if debian: - append('/etc/apt/sources.list', "deb http://www.debian-multimedia.org squeeze main non-free", use_sudo=True) + #if debian: + #append('/etc/apt/sources.list', "deb http://www.debian-multimedia.org squeeze main non-free", use_sudo=True) def ubuntu_lucid_32(fresh_os=True): if (fresh_os): @@ -187,15 +187,15 @@ def debian_squeeze_64(fresh_os=True): create_fresh_os('Debian_Squeeze_64', debian=True) def airtime_180_tar(): - airtime_18x_tar("1.8.0") + airtime_18x_tar("airtime", "1.8.0") def airtime_181_tar(): - airtime_18x_tar("1.8.1") + airtime_18x_tar("airtime", "1.8.1") def airtime_182_tar(): - airtime_18x_tar("1.8.2") + airtime_18x_tar("airtime-1.8.2" "1.8.2") -def airtime_18x_tar(version): +def airtime_18x_tar(root_dir, version): do_sudo('apt-get update') do_sudo('apt-get install -y tar gzip unzip apache2 php5-pgsql libapache2-mod-php5 ' + \ 'php-pear php5-gd postgresql odbc-postgresql python python-configobj poc-streamer ' + \ @@ -228,7 +228,7 @@ def airtime_18x_tar(version): do_run('wget http://downloads.sourceforge.net/project/airtime/%s/airtime-%s.tar.gz' % (version, version)) do_run('tar xfz airtime-%s.tar.gz' % version) - do_sudo('cd ~/airtime-%s/install && php airtime-install.php' % version) + do_sudo('cd ~/%s/install && php airtime-install.php' % root_dir) #need to reboot because of daemon-tools. reboot(45) diff --git a/install_full/debian/airtime-full-install b/install_full/debian/airtime-full-install new file mode 100755 index 000000000..805f1ee7e --- /dev/null +++ b/install_full/debian/airtime-full-install @@ -0,0 +1,14 @@ +#!/bin/bash +# +# Auto install script for airtime on Debian + + +#Current dir +# Absolute path to this script, e.g. /home/user/bin/foo.sh +SCRIPT=`readlink -f $0` +# Absolute path this script is in, thus /home/user/bin +SCRIPTPATH=`dirname $SCRIPT` + +cd $SCRIPTPATH/../ubuntu +./airtime-full-install + diff --git a/install_full/ubuntu/airtime-full-install b/install_full/ubuntu/airtime-full-install index c4c3f82c9..995acddfa 100755 --- a/install_full/ubuntu/airtime-full-install +++ b/install_full/ubuntu/airtime-full-install @@ -22,6 +22,15 @@ echo "----------------------------------------------------" echo " 1. Install Packages" echo "----------------------------------------------------" +dist=`lsb_release -is` + +if [ "$dist" -eq "Debian" ]; then + grep "deb http://www.debian-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 + fi +fi + apt-get update # Updated package list