Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch '2.0.x' into devel

Browse source 
Conflicts:
	VERSION
	airtime_mvc/application/models/Systemstatus.php
	install_minimal/include/airtime-constants.php
	install_minimal/include/airtime-upgrade.php
	python_apps/api_clients/api_client.py
	python_apps/media-monitor/install/media-monitor-copy-files.py
	python_apps/media-monitor/install/media-monitor-initialize.py
	python_apps/pypo/install/pypo-initialize.py
	python_apps/pypo/liquidsoap_bin
	python_apps/pypo/pypopush.py
	utils/airtime-log.php
This commit is contained in:
Martin Konecny 2012-04-12 19:08:55 -04:00
commit f96b990275
23 changed files with 121 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
install_minimal/include/AirtimeInstall.php
View file

@ -33,7 +33,7 @@ class AirtimeInstall
public static function ExitIfNotRoot()
{
// Need to check that we are superuser before running this.
if(exec("whoami") != "root"){
if(posix_geteuid() != 0){
echo "Must be root user.\n";
exit(1);
}

2
install_minimal/include/airtime-copy-files.sh
View file

@ -2,7 +2,7 @@
#-e Causes bash script to exit if any of the installers
#return with a non-zero return value.
if [ `whoami` != 'root' ]; then
if [[ $EUID -ne 0 ]]; then
echo "Please run as root user."
exit 1
fi

2
install_minimal/include/airtime-initialize.sh
View file

@ -2,7 +2,7 @@
#-e Causes bash script to exit if any of the installers
#return with a non-zero return value.
if [ `whoami` != 'root' ]; then
if [[ $EUID -ne 0 ]]; then
echo "Please run as root user."
exit 1
fi

2
install_minimal/include/airtime-remove-files.sh
View file

@ -2,7 +2,7 @@
#-e Causes bash script to exit if any of the installers
#return with a non-zero return value.
if [ `whoami` != 'root' ]; then
if [[ $EUID -ne 0 ]]; then
echo "Please run as root user."
exit 1
fi

2
install_minimal/include/airtime-uninitialize.sh
View file

@ -2,7 +2,7 @@
#-e Causes bash script to exit if any of the installers
#return with a non-zero return value.
if [ `whoami` != 'root' ]; then
if [[ $EUID -ne 0 ]]; then
echo "Please run as root user."
exit 1
fi

9
install_minimal/include/airtime-upgrade.php
View file

@ -11,7 +11,7 @@ require_once(__DIR__.'/airtime-constants.php');
require_once(dirname(__FILE__).'/AirtimeIni.php');
require_once(dirname(__FILE__).'/AirtimeInstall.php');
if(exec("whoami") != "root"){
if(posix_geteuid() != 0){
echo "Must be root user.\n";
exit(1);
}
@ -111,10 +111,13 @@ if (strcmp($version, "2.0.2") < 0){
passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini $SCRIPTPATH/../upgrades/airtime-2.0.2/airtime-upgrade.php");
pause();
}
if (strcmp($version, "2.1.0") < 0){
passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini $SCRIPTPATH/../upgrades/airtime-2.1.0/airtime-upgrade.php");
if (strcmp($version, "2.0.3") < 0){
passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini $SCRIPTPATH/../upgrades/airtime-2.0.3/airtime-upgrade.php");
pause();
}
if (strcmp($version, "2.1.0") < 0){
passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini $SCRIPTPATH/../upgrades/airtime-2.1.0/airtime-upgrade.php");
}
//set the new version in the database.
$sql = "DELETE FROM cc_pref WHERE keystr = 'system_version'";