From 00cd77d75de1a30cf4164740cf241e3a93f86208 Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Thu, 24 May 2012 16:23:42 +0000 Subject: [PATCH] 2012-05-24 Miguel de Dios * extensions/update_manager/lib/functions.ajax.php: some fixes, and exclude the install "install.php" file or "config.php". MERGED FROM 4.0.2 git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6344 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 8 +++++++- .../extensions/update_manager/lib/functions.ajax.php | 11 +++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index ad5e50eb03..92f889d492 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,10 @@ +2012-05-24 Miguel de Dios + + * extensions/update_manager/lib/functions.ajax.php: some fixes, and + exclude the install "install.php" file or "config.php". + + MERGED FROM 4.0.2 + 2012-05-24 Sancho Lerena * pandoradb_data.sql: Updated defaults: compact is not enabled by default @@ -12,7 +19,6 @@ extensions/update_manager/update_pandora.php: cleaned source code style. - MERGED FROM 4.0.2 2012-05-22 Sergio Martin diff --git a/pandora_console/extensions/update_manager/lib/functions.ajax.php b/pandora_console/extensions/update_manager/lib/functions.ajax.php index 603e2ff83b..60a0b23b81 100644 --- a/pandora_console/extensions/update_manager/lib/functions.ajax.php +++ b/pandora_console/extensions/update_manager/lib/functions.ajax.php @@ -323,12 +323,15 @@ function update_pandora_install_package() { //Get total files //The grep command is because the fucking tar don't apply //strip-components in mode "t" - $command = 'tar tzvf ' . $dir . $filename . ' | grep -v "pandora_console/$" | wc -l > /tmp/' . $package . '.info.txt'; + $command = 'tar tzvf ' . $dir . $filename . + ' --exclude="pandora_console/install.php" --exclude="pandora_console/include/config.php" | grep -v "pandora_console/$" | wc -l > /tmp/' . $package . '.info.txt'; exec($command, $output, $status); - html_debug_print($command, true); + //html_debug_print($command, true); - $command = 'tar xzvf ' . $dir . $filename . ' --strip-components=1 -C ' . $config['homedir'] . ' 1>/tmp/' . $package . '.files.info.txt'; - html_debug_print($command, true); + $command = 'tar xzvf ' . $dir . $filename . + ' --exclude="pandora_console/install.php" --exclude="pandora_console/include/config.php" ' . + ' --strip-components=1 -C ' . $config['homedir'] . ' 1>/tmp/' . $package . '.files.info.txt'; + //html_debug_print($command, true); //Maybe this line run for seconds or minutes exec($command, $output, $status);