Merge branch 'master' of dev.sourcefabric.org:airtime
Conflicts: application/configs/conf.php install/airtime-install.php
This commit is contained in:
commit
a20e279840
64 changed files with 110 additions and 193 deletions
|
@ -45,7 +45,7 @@ function checkIfRoot(){
|
|||
if(exec("whoami") != "root"){
|
||||
echo "Must be root user.\n";
|
||||
exit(1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function updateINIKeyValues($filename, $property, $value){
|
||||
|
@ -62,7 +62,7 @@ function updateINIKeyValues($filename, $property, $value){
|
|||
for($i=0; $i<$n; $i++){
|
||||
fwrite($fp, $lines[$i]);
|
||||
}
|
||||
fclose($fp);
|
||||
fclose($fp);
|
||||
}
|
||||
|
||||
function directorySetup($CC_CONFIG){
|
||||
|
@ -90,7 +90,7 @@ echo " *** Directory Setup ***\n";
|
|||
//exit(1);
|
||||
}
|
||||
$CC_CONFIG[$d] = $rp;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
@ -153,4 +153,4 @@ $command = __DIR__."/../utils/airtime-import --copy ../audio_samples/ > /dev/nul
|
|||
$command = "python ".__DIR__."/../pypo/install/pypo-install.py";
|
||||
system($command);
|
||||
echo "******************************* Install Complete *******************************\n";
|
||||
?>
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue