Merge branch '2.1.x' into devel

Conflicts:
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/controllers/PlaylistController.php
	airtime_mvc/application/models/Playlist.php
	python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py
	python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py

install_minimal/airtime-install

@@ -107,12 +107,28 @@ echo "* Making sure /etc/default/locale is set properly"
 set +e
 update-locale
 cat /etc/default/locale | grep -i "LANG=.*UTF-\?8"
-set -e
 if [ "$?" != "0" ]; then
-    echo "non UTF-8 default locale found in /etc/default/locale."
+    echo -e " * Fail\n"
+    echo "A non UTF-8 default locale found in /etc/default/locale. Airtime requires
+a UTF-8 locale to run. To fix this please do the following:
+
+Ubuntu:
+Put line 'en_US.UTF-8 UTF-8' (or similar) without quotes to '/var/lib/locales/supported.d/local', 
+replacing any existing lines.
+A list of supported locales is available in '/usr/share/i18n/SUPPORTED'
+Then run 'sudo dpkg-reconfigure locales'
+
+Debian:
+Run 'sudo dpkg-reconfigure locales' and use the interface to select 'en_US.UTF-8 UTF-8' (or similar).
+On the second page select this new locale as the default.
+
+After these changes have been made simply run install again.
+
+Now exiting install...
+"
     exit 1
 fi
-
+set -e
 
 # Check if airtime exists already
 set +e

install_minimal/airtime-uninstall

@@ -6,6 +6,28 @@ if [[ $EUID -ne 0 ]]; then
     exit 1
 fi
 
+
+options=$(getopt -o p -l purge -- "$@")
+if [ $? -ne 0 ]; then
+    echo "only -p or --purge parameter allowed"
+    exit 1
+fi
+eval set -- "$options"
+
+purge='f'
+
+while true
+do
+    case "$1" in
+    -p|--purge)      purge='t'; shift;;
+    --)             shift 1; break ;;
+        *)              break ;;
+    esac
+done
+
+#Make 'purge' env variable available to sub bash script
+export purge
+
 echo -e "\n******************************* Uninstall Begin ********************************"
 
 # Absolute path to this script, e.g. /home/user/bin/foo.sh

install_minimal/include/airtime-uninitialize.sh

@@ -19,7 +19,6 @@ set +e
 monit unmonitor airtime-media-monitor >/dev/null 2>&1
 monit unmonitor airtime-liquidsoap >/dev/null 2>&1
 monit unmonitor airtime-playout >/dev/null 2>&1
-#monit unmonitor airtime-show-recorder >/dev/null 2>&1
 monit unmonitor rabbitmq-server
 set -e
 
@@ -31,5 +30,7 @@ python $AIRTIMEROOT/python_apps/pypo/install/pypo-uninitialize.py
 python $AIRTIMEROOT/python_apps/media-monitor/install/media-monitor-uninitialize.py
 #python $AIRTIMEROOT/python_apps/show-recorder/install/recorder-uninitialize.py
 
+if [ "$purge" = "t" ]; then
 #call Airtime uninstall script
 php --php-ini ${SCRIPTPATH}/../airtime-php.ini ${SCRIPTPATH}/airtime-uninstall.php
+fi