tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2012-05-24 Miguel de Dios <miguel.dedios@artica.es> 

* 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
This commit is contained in:
mdtrooper 2012-05-24 16:23:42 +00:00
parent 6bc5fd6409
commit 5049a52559
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2012-05-24 Miguel de Dios <miguel.dedios@artica.es>
* 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 <slerena@artica.es>
* 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 <sergio.martin@artica.es>

11
pandora_console/extensions/update_manager/lib/functions.ajax.php
View File

@ -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);