dbxe
/
fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

recursive_copy function use cp -R if it exists

This commit is contained in:
Mark Crane 2014-05-16 05:14:44 +00:00
parent 59e112e7ff
commit b9643b60ee
2 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
resources/classes/install.php
View File

@ -37,7 +37,10 @@ include "root.php";
//$option '-n' --no-clobber //$option '-n' --no-clobber
function recursive_copy($src, $dst, $option = '') { function recursive_copy($src, $dst, $option = '') {
if (file_exists('/bin/cp')) {
exec ('cp -R $option '.$src_dir.' '.$dst_dir);
}
else {
$dir = opendir($src); $dir = opendir($src);
if (!$dir) { if (!$dir) {
if (!mkdir($src, 0755, true)) { if (!mkdir($src, 0755, true)) {
@ -70,6 +73,7 @@ include "root.php";
} }
closedir($dir); closedir($dir);
} }
}
function recursive_delete($dir) { function recursive_delete($dir) {
if (strlen($dir) > 0) { if (strlen($dir) > 0) {

2
resources/install.php
View File

@ -1279,8 +1279,6 @@ if ($_POST["install_step"] == "3" && count($_POST) > 0 && strlen($_POST["persist
$install->switch_conf_dir = $switch_conf_dir; $install->switch_conf_dir = $switch_conf_dir;
$install->switch_scripts_dir = $switch_scripts_dir; $install->switch_scripts_dir = $switch_scripts_dir;
$install->switch_sounds_dir = $switch_sounds_dir; $install->switch_sounds_dir = $switch_sounds_dir;
$install->recursive_delete($switch_conf_dir);
clearstatcache();
$install->copy_conf(); $install->copy_conf();
$install->copy(); $install->copy();