[zi-cvs] packages/com.zzoss.zic.plugin.config install_process.php,1.5,1.6
Sandro Zic <[email protected]> Fri, 26 Mar 2004 10:36:05 +0000
| Newsgroups | gmane.comp.php.zzoss.installer.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/zzossinstaller/packages/com.zzoss.zic.plugin.config
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25345
Modified Files:
install_process.php
Log Message:
also deal with @install-as
Index: install_process.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic.plugin.config/install_process.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** install_process.php 15 Mar 2004 09:24:57 -0000 1.5
--- install_process.php 26 Mar 2004 10:36:03 -0000 1.6
***************
*** 93,97 ****
$replace->replace($replace_values);
! echo $pkg_data_dir = $GLOBALS['ZI']['plugin_data_dir'].DIRECTORY_SEPARATOR.$GLOBALS['ZI']['package_name'].DIRECTORY_SEPARATOR;
$GLOBALS['ZI']['plugin_log'] .= "Creating data dir '$pkg_data_dir'\n";
System::mkdir(array('-p', $pkg_data_dir));
--- 93,97 ----
$replace->replace($replace_values);
! $pkg_data_dir = $GLOBALS['ZI']['plugin_data_dir'].DIRECTORY_SEPARATOR.$GLOBALS['ZI']['package_name'].DIRECTORY_SEPARATOR;
$GLOBALS['ZI']['plugin_log'] .= "Creating data dir '$pkg_data_dir'\n";
System::mkdir(array('-p', $pkg_data_dir));
***************
*** 112,119 ****
// Compose file name to write out.
! if(!isset($build_file['@']['save-as'])){
! $dest_file = ZZOSS_InstallerUtils::fixPath($dest_dir.$build_file['@']['name']);
! } else {
$dest_file = ZZOSS_InstallerUtils::fixPath($dest_dir.$build_file['@']['save-as']);
}
--- 112,121 ----
// Compose file name to write out.
! if(isset($build_file['@']['save-as'])){
$dest_file = ZZOSS_InstallerUtils::fixPath($dest_dir.$build_file['@']['save-as']);
+ } elseif(isset($build_file['@']['install-as'])){
+ $dest_file = ZZOSS_InstallerUtils::fixPath($dest_dir.$build_file['@']['install-as']);
+ } else {
+ $dest_file = ZZOSS_InstallerUtils::fixPath($dest_dir.$build_file['@']['name']);
}
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click