Project

General

Profile

« Previous | Next » 

Revision 53b9a2ac

Added by NOYB NOYB over 8 years ago

Report quantity of files being installed by minimal and diff options.

Also consolidate some unset commands.

(cherry picked from commit 32912ae833a016784cbb4813c45960cefc2d896b)

View differences:

src/etc/phpshellsessions/gitsync
468 468
	$files_to_copy_array = array_merge($updated_files_array[1], $different_files_array[1], $missing_files_array[1]);
469 469
	$files_to_copy_array = array_unique($files_to_copy_array);
470 470

  
471
	unset($updated_files_array);
472
	unset($different_files_array);
473
	unset($missing_files_array);
471
	unset($updated_files_array, $different_files_array, $missing_files_array);
474 472

  
475 473
	# Convert the list from an array to a space separated quoted string.  Quoted for white space file name support.
476 474
	if (count($files_to_copy_array) > 0) {	# Leave the string empty/unset if there is nothing to copy.
477 475
		$files_to_copy = '"' . implode('" "', $files_to_copy_array) . '"';
478 476
	}
477
	$qty_files_to_copy = count($files_to_copy_array);
479 478
	unset($files_to_copy_array);
480 479
} else {
481 480
	$files_to_copy = '.';
481
	$qty_files_to_copy = chr(8);
482 482
}
483 483

  
484 484
$tar_options = '-C ./src';
485 485

  
486
echo "===> Installing new files...\n";
486
echo "===> Installing $qty_files_to_copy new files...\n";
487 487

  
488 488
if ($g['platform'] == $g['product_name']) {
489 489
	$command = "cd $CODIR/pfSenseGITREPO/pfSenseGITREPO ; tar -cpf - {$tar_options} {$files_to_copy} | (cd / ; tar -Uxpf -)";

Also available in: Unified diff