Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

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

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

install_minimal/include/airtime-installed-check.php

@@ -15,6 +15,8 @@ require_once(__DIR__.'/airtime-constants.php');
 AirtimeInstall::ExitIfNotRoot();
 
 if (!file_exists('/etc/airtime/airtime.conf')) {
+    #airtime.conf doesn't exist, and we need it to connect to database
+    #Assume Airtime is not installed.
     return 0;
 }