From 42fbab9ff760ea7fc8ddc6e49bd0e2e7308d8bf2 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Mon, 30 Apr 2012 12:17:25 -0400 Subject: [PATCH] CC-3738: Installation: Errors on installation -also commented out code --- install_minimal/include/airtime-copy-files.sh | 7 +++---- install_minimal/include/airtime-initialize.sh | 4 ---- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/install_minimal/include/airtime-copy-files.sh b/install_minimal/include/airtime-copy-files.sh index 62ac6524a..e173842d9 100755 --- a/install_minimal/include/airtime-copy-files.sh +++ b/install_minimal/include/airtime-copy-files.sh @@ -35,7 +35,9 @@ AIRTIMEROOT=$SCRIPTPATH/../../ echo "* Creating /etc/airtime" mkdir -p /etc/airtime -if [ ! -e /etc/airtime/airtime.conf ]; then +#if [ ! -e /etc/airtime/airtime.conf ]; then +if [ "$DO_UPGRADE" -eq "0" ]; then + #We aren't doing an upgrade so simply overwrite the config files. cp $AIRTIMEROOT/airtime_mvc/build/airtime.conf /etc/airtime fi @@ -62,9 +64,6 @@ if [ "$python_service" -eq "0" ]; then if [ "$pypo" = "t" ]; then python $AIRTIMEROOT/python_apps/pypo/install/pypo-copy-files.py fi - #if [ "$showrecorder" = "t" ]; then - # python $AIRTIMEROOT/python_apps/show-recorder/install/recorder-copy-files.py - #fi fi mkdir -p /usr/lib/airtime diff --git a/install_minimal/include/airtime-initialize.sh b/install_minimal/include/airtime-initialize.sh index 5383ff311..d3d6cdfed 100755 --- a/install_minimal/include/airtime-initialize.sh +++ b/install_minimal/include/airtime-initialize.sh @@ -36,10 +36,6 @@ fi if [ "$pypo" = "t" ]; then python $AIRTIMEROOT/python_apps/pypo/install/pypo-initialize.py fi -#if [ "$showrecorder" = "t" ]; then -# python $AIRTIMEROOT/python_apps/show-recorder/install/recorder-initialize.py -#fi - # Start monit if it is not running, or restart if it is. # Need to ensure monit is running before Airtime daemons are run. This is