Added: `pre_remove' attribute -- Allows to remove previous directory …

…(folder xml node from install.xml files)

Typo

CHANGELOG

@@ -50,6 +50,7 @@ FRONTEND
 
 INSTALLER
     Added: `copy_as' attribute -- Allows to copy a file with specific name (copy_config xml node from install.xml files)
+    Added: `pre_remove' attribute -- Allows to remove previous directory (folder xml node from install.xml files)
     Enhancement: Make it possible to provide per distribution (codename) configuration file
     Enhancement: Provide good default values for installer whenever possible
     Fixed: `build' mode is broken for fresh installs -- Packages must be pre-installed regardless of install mode

autoinstaller/Functions.pm

@@ -904,15 +904,7 @@ sub _processFolderNode
     my ($node) = @_;
 
     my $dir = iMSCP::Dir->new( dirname => $node->{'content'} );
-
-    # Needed to be sure to not keep any file from a previous build that has
-    # failed
-    if ( defined $main::{'INST_PREF'}
-        && $main::{'INST_PREF'} eq $node->{'content'}
-    ) {
-        $dir->remove();
-    }
-
+    $dir->remove() if $node->{'pre_remove'};
     $dir->make(
         {
             user  => defined $node->{'user'} ? _expandVars( $node->{'owner'} ) : undef,

configs/debian/install.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <install>
     <folder mode="1777">/tmp</folder>
-    <folder export="INST_PREF">/tmp/imscp</folder>
+    <folder export="INST_PREF" pre_remove="1">/tmp/imscp</folder>
     <folder mode="0755" export="ROOT_CONF">${INST_PREF}/etc</folder>
     <folder export="SYSTEM_CONF">${INST_PREF}/etc/imscp</folder>
     <folder mode="0755">${INST_PREF}/usr</folder>

engine/PerlLib/iMSCP/Dir.pm

@@ -140,7 +140,7 @@ sub isEmpty
 
  Clear a full directory content or the files/diretories inside the directory that match the given regexp
 
- Param Regexp $regexp OPTIOANL regexp for directory content matching
+ Param Regexp $regexp OPTIONAL regexp for directory content matching
  Return int 0 on success or die on failure
 
 =cut