[zi-cvs] packages/com.zzoss.zic application_delete.php,1.9,1.10 application_done.php,1.17,1.18 application_update_confirm.php,1.5,1.6 applications.php,1.25,1.26 dev_application_import.php,1.8,1.9 dev_bundle_instant.php,1.8,1.9 info.php,1.8,1.9
Sandro Zic <[email protected]> Mon, 17 May 2004 15:55:47 +0000
| Newsgroups | gmane.comp.php.zzoss.installer.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/zzossinstaller/packages/com.zzoss.zic
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24557/com.zzoss.zic
Modified Files:
application_delete.php application_done.php
application_update_confirm.php applications.php
dev_application_import.php dev_bundle_instant.php info.php
Log Message:
- perform update in a sandbox within the installer data directory:
- copy the old app to the sandbox
- install the new app to the sandbox
- copy back the new app to the application root
<- important when installer installs itself
<- makes sure that update is only finalized if no errors occured
Index: dev_bundle_instant.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/dev_bundle_instant.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** dev_bundle_instant.php 3 Apr 2004 16:15:48 -0000 1.8
--- dev_bundle_instant.php 17 May 2004 15:55:45 -0000 1.9
***************
*** 29,33 ****
if($_REQUEST['action'] == 'start'){
// remember the app we want to bundle
! $app_settings = $zi_registry->getApplicationSettings($_REQUEST['application_bundle'], $_REQUEST['distribution_bundle']);
$_SESSION['distribution'] = $_REQUEST['distribution_bundle'];
$_SESSION['application'] = $_REQUEST['application_bundle'];
--- 29,33 ----
if($_REQUEST['action'] == 'start'){
// remember the app we want to bundle
! $app_settings = $zi_registry->getApplicationSettings('', $_REQUEST['application_bundle'], $_REQUEST['distribution_bundle']);
$_SESSION['distribution'] = $_REQUEST['distribution_bundle'];
$_SESSION['application'] = $_REQUEST['application_bundle'];
***************
*** 55,59 ****
// change the application root to the instant sources in data directory
$app_settings['application_root'] = $instant_dir;
! $zi_registry->updateApplicationSettings($app_settings, $_REQUEST['application'], $_REQUEST['distribution']);
$procedures = array(
'plugins_deps' => 'installed',
--- 55,59 ----
// change the application root to the instant sources in data directory
$app_settings['application_root'] = $instant_dir;
! $zi_registry->updateApplicationSettings($app_settings, '', $_REQUEST['application'], $_REQUEST['distribution']);
$procedures = array(
'plugins_deps' => 'installed',
Index: application_update_confirm.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/application_update_confirm.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** application_update_confirm.php 17 May 2004 09:55:23 -0000 1.5
--- application_update_confirm.php 17 May 2004 15:55:45 -0000 1.6
***************
*** 38,48 ****
--- 38,64 ----
if(is_dir($extract_dir)){
+ // OLD APPLICATION
+
// get the application settings of the old application.
$app_settings = $zi_registry->getApplicationSettings();
+ // sandbox directory where update is performed
+ $dir_sandbox = $zi_registry->getApplicationPath().'update_sandbox'.DIRECTORY_SEPARATOR;
+ System::mkdir(array('-p', $dir_sandbox));
+ // copy installed app to sandbox
+ require_once 'ZZOSS_Dir/Dir.php';
+ ZZOSS_Dir::copy($app_settings['application_root'], $dir_sandbox);
+
+ // set the application root to the sandbox directory
+ $app_settings_update = $app_settings;
+ $app_setttings_update['application_root'] = $dir_sandbox;
+ //$zi_registry->updateApplicationSettings($app_settings_update, 'update');
+
ZZOSS_Package::extractDistribution($extract_dir, $zi_registry->getDir());
//System::rm(array('-rf', $extract_dir));
+ // NEW APPLICATION
+
// hide this application until installed
$zi_registry->setHiddenApplication($_REQUEST['new_app'], $_REQUEST['new_distri']);
***************
*** 54,57 ****
--- 70,75 ----
// register old application settings for new one
$zi_registry->updateApplicationSettings($app_settings);
+ // register sandbox settings for update
+ $zi_registry->updateApplicationSettings($app_settings_update, 'update');
//$_REQUEST['id'] = $application['id'];
Index: application_delete.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/application_delete.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** application_delete.php 17 May 2004 09:53:50 -0000 1.9
--- application_delete.php 17 May 2004 15:55:45 -0000 1.10
***************
*** 37,41 ****
if($application = $zi_registry->getApplication()){
//if(isset($_REQUEST['mode']) && $_REQUEST['mode'] != 'dev'){
! $application_settings = $zi_registry->getApplicationSettings($application['name'].'-'.$application['release']['version']);
if(
--- 37,41 ----
if($application = $zi_registry->getApplication()){
//if(isset($_REQUEST['mode']) && $_REQUEST['mode'] != 'dev'){
! $application_settings = $zi_registry->getApplicationSettings('', $application['name'].'-'.$application['release']['version']);
if(
Index: info.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/info.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** info.php 6 May 2004 12:34:19 -0000 1.8
--- info.php 17 May 2004 15:55:45 -0000 1.9
***************
*** 175,179 ****
// Show the installation paths if it is an installed application
if($_REQUEST['type'] == 'application' && isset($info['installed'])){
! $settings = $zi_registry->getApplicationSettings($info['name'].'-'.$info['release']['version'], $_REQUEST['distribution']);
$content .= zi_info_td('Install Root', $settings['application_root']);
$content .= zi_info_td('Install URL', '<a href="'.$settings['application_url'].'" target="_blank">'.$settings['application_url'].'</a>');
--- 175,179 ----
// Show the installation paths if it is an installed application
if($_REQUEST['type'] == 'application' && isset($info['installed'])){
! $settings = $zi_registry->getApplicationSettings('', $info['name'].'-'.$info['release']['version'], $_REQUEST['distribution']);
$content .= zi_info_td('Install Root', $settings['application_root']);
$content .= zi_info_td('Install URL', '<a href="'.$settings['application_url'].'" target="_blank">'.$settings['application_url'].'</a>');
Index: dev_application_import.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/dev_application_import.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** dev_application_import.php 4 Apr 2004 09:45:36 -0000 1.8
--- dev_application_import.php 17 May 2004 15:55:45 -0000 1.9
***************
*** 90,93 ****
--- 90,94 ----
$zi_registry->updateApplicationSettings(
$_REQUEST["ZI_VALUES"],
+ '',
$application["name"].'-'.$application["release"]["version"],
$distribution["name"].'-'.$distribution["release"]["version"]
Index: application_done.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/application_done.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** application_done.php 17 May 2004 09:55:23 -0000 1.17
--- application_done.php 17 May 2004 15:55:45 -0000 1.18
***************
*** 62,65 ****
--- 62,74 ----
// if this is an update, remove the old application
if(isset($_REQUEST['update_distri']) && isset($_REQUEST['update_app'])){
+ // copy the files from the sandbox to the application root
+ $app_settings = $zi_registry->getApplicationSettings('update');
+ $dir_sandbox = $app_settings['application_root'];
+ $app_settings = $zi_registry->getApplicationSettings();
+
+ require_once 'ZZOSS_Dir/Dir.php';
+ ZZOSS_Dir::copy($dir_sandbox, $app_settings['application_root']);
+
+ // delete the old application, including the sandbox files
$zi_registry->removeApplication($_REQUEST['update_app'], $_REQUEST['update_distri']);
}
Index: applications.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/applications.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** applications.php 11 May 2004 23:21:00 -0000 1.25
--- applications.php 17 May 2004 15:55:45 -0000 1.26
***************
*** 271,275 ****
?> <?php
if($installed){
! $app_settings = $zi_registry->getApplicationSettings($application['name'].'-'.$application['release']['version']);
?> <a href="<?php echo $app_settings['application_url']; ?>" title="View Application" target="_blank"><img src="themes/share/icons/org.kde.icons.crystalsvg/16x16/window_new.gif" border="0" alt="View Application" align="absmiddle"></a>
<a title="Installation Log" href="log.php?mode=<?php echo $_REQUEST['mode']; ?>&type=application&application=<?php echo $application["name"].'-'.$application["release"]['version']; ?>&distribution=<?php echo rawurlencode($distribution['name'].'-'.$distribution['release']['version']); ?>" onclick="javascript:window.open('log.php?mode=<?php echo $_REQUEST['mode']; ?>&type=application&application=<?php echo $application["name"].'-'.$application["release"]['version']; ?>&distribution=<?php echo rawurlencode($distribution['name'].'-'.$distribution['release']['version']); ?>', 'LogFile', 'width=500,height=500,resizable=1,status=0,scrollbars=1,toolbar=0,location=0,directories=0,menubar=0,dependent=0');void(0);javascript:return(false);" target="_blank" title="Log File"><img src="themes/share/icons/org.kde.icons.crystalsvg/16x16/log.gif" border="0" alt="I
nstallation Log" align="absmiddle"></a><?php
--- 271,275 ----
?> <?php
if($installed){
! $app_settings = $zi_registry->getApplicationSettings('', $application['name'].'-'.$application['release']['version']);
?> <a href="<?php echo $app_settings['application_url']; ?>" title="View Application" target="_blank"><img src="themes/share/icons/org.kde.icons.crystalsvg/16x16/window_new.gif" border="0" alt="View Application" align="absmiddle"></a>
<a title="Installation Log" href="log.php?mode=<?php echo $_REQUEST['mode']; ?>&type=application&application=<?php echo $application["name"].'-'.$application["release"]['version']; ?>&distribution=<?php echo rawurlencode($distribution['name'].'-'.$distribution['release']['version']); ?>" onclick="javascript:window.open('log.php?mode=<?php echo $_REQUEST['mode']; ?>&type=application&application=<?php echo $application["name"].'-'.$application["release"]['version']; ?>&distribution=<?php echo rawurlencode($distribution['name'].'-'.$distribution['release']['version']); ?>', 'LogFile', 'width=500,height=500,resizable=1,status=0,scrollbars=1,toolbar=0,location=0,directories=0,menubar=0,dependent=0');void(0);javascript:return(false);" target="_blank" title="Log File"><img src="themes/share/icons/org.kde.icons.crystalsvg/16x16/log.gif" border="0" alt="I
nstallation Log" align="absmiddle"></a><?php
-------------------------------------------------------
This SF.Net email is sponsored by: SourceForge.net Broadband
Sign-up now for SourceForge Broadband and get the fastest
6.0/768 connection for only $19.95/mo for the first 3 months!
http://ads.osdn.com/?ad_id=2562&alloc_id=6184&op=click