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

CC-2600 : Upgrading from 1.8->1.9 wipe all shows content

Browse source
This commit is contained in:
Naomi Aro 2011-07-28 11:13:00 +02:00
parent 8187a5504b
commit a744e11370
3 changed files with 2 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

21
install_minimal/upgrades/airtime-1.8.1/airtime-upgrade.php
View file

@ -213,24 +213,6 @@ function MergeConfigFiles($configFiles, $suffix)
} }
} }
function InstallPhpCode()
{
global $CC_CONFIG;
global $AIRTIME_SRC;
echo "* Installing PHP code to ".$CC_CONFIG['phpDir'].PHP_EOL;
exec("mkdir -p ".$CC_CONFIG['phpDir']);
exec("cp -R ".$AIRTIME_SRC."/* ".$CC_CONFIG['phpDir']);
}
function InstallBinaries()
{
global $AIRTIME_UTILS;
echo "* Installing binaries to ".CONF_DIR_BINARIES.PHP_EOL;
exec("mkdir -p ".CONF_DIR_BINARIES);
exec("cp -R ".$AIRTIME_UTILS." ".CONF_DIR_BINARIES);
}
// Backup the config files // Backup the config files
$suffix = date("Ymdhis")."-1.8.1"; $suffix = date("Ymdhis")."-1.8.1";
foreach ($configFiles as $conf) { foreach ($configFiles as $conf) {
@ -245,6 +227,3 @@ echo "* Initializing INI files".PHP_EOL;
MergeConfigFiles($configFiles, $suffix); MergeConfigFiles($configFiles, $suffix);
$CC_CONFIG = LoadConfig($CC_CONFIG); $CC_CONFIG = LoadConfig($CC_CONFIG);
InstallPhpCode();
InstallBinaries();

20
install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php
View file

@ -213,23 +213,6 @@ function MergeConfigFiles($configFiles, $suffix)
} }
} }
function InstallPhpCode()
{
global $CC_CONFIG;
global $AIRTIME_SRC;
echo "* Installing PHP code to ".$CC_CONFIG['phpDir'].PHP_EOL;
exec("mkdir -p ".$CC_CONFIG['phpDir']);
exec("cp -R ".$AIRTIME_SRC."/* ".$CC_CONFIG['phpDir']);
}
function InstallBinaries()
{
global $AIRTIME_UTILS;
echo "* Installing binaries to ".CONF_DIR_BINARIES.PHP_EOL;
exec("mkdir -p ".CONF_DIR_BINARIES);
exec("cp -R ".$AIRTIME_UTILS." ".CONF_DIR_BINARIES);
}
$suffix = date("Ymdhis")."-1.8.2"; $suffix = date("Ymdhis")."-1.8.2";
foreach ($configFiles as $conf) { foreach ($configFiles as $conf) {
if (file_exists($conf)) { if (file_exists($conf)) {
@ -243,6 +226,3 @@ echo "* Initializing INI files".PHP_EOL;
MergeConfigFiles($configFiles, $suffix); MergeConfigFiles($configFiles, $suffix);
$CC_CONFIG = LoadConfig($CC_CONFIG); $CC_CONFIG = LoadConfig($CC_CONFIG);
InstallPhpCode();
InstallBinaries();

3
install_minimal/upgrades/airtime-1.9.0/media-monitor-upgrade.py
View file

@ -38,7 +38,8 @@ mmc = MediaMonitorCommon(mmconfig)
try: try:
os.makedirs(organize_dir) os.makedirs(organize_dir)
except Exception, e: except Exception, e:
print e #organize dir already exists. ( really shouldn't though )
pass
#older versions of Airtime installed from repository at least had owner of stor dir as "root" #older versions of Airtime installed from repository at least had owner of stor dir as "root"
mmc.set_needed_file_permissions(stor_dir, True) mmc.set_needed_file_permissions(stor_dir, True)