This commit is contained in:
Ronald Quenta
2017-08-11 17:36:23 -04:00
parent 211da8bc50
commit 85296ff8ff
2 changed files with 42 additions and 39 deletions

View File

@@ -491,7 +491,8 @@ function addTarFolder($tar, $pathBase, $pluginHome) {
} }
} }
function run_pack_plugin($task, $args) { function run_pack_plugin($task, $args)
{
ini_set('display_errors', 'on'); ini_set('display_errors', 'on');
ini_set('error_reporting', E_ERROR); ini_set('error_reporting', E_ERROR);
@@ -505,8 +506,6 @@ function run_pack_plugin($task, $args) {
} }
$pluginName = $args[0]; $pluginName = $args[0];
$pluginDirectory = PATH_PLUGINS . $pluginName;
$pluginOutDirectory = PATH_OUTTRUNK . 'plugins' . PATH_SEP . $pluginName;
$pluginHome = PATH_OUTTRUNK . 'plugins' . PATH_SEP . $pluginName; $pluginHome = PATH_OUTTRUNK . 'plugins' . PATH_SEP . $pluginName;
//verify if plugin exists, //verify if plugin exists,
@@ -517,11 +516,17 @@ function run_pack_plugin($task, $args) {
die(); die();
} }
require_once ($pluginFilename); if (!file_exists($pluginFilename)) {
printf("Error: %s\n", pakeColor::colorize('you must specify a valid name for the plugin', 'ERROR'));
exit(0);
}
$oPluginRegistry = PluginRegistry::loadSingleton(); if (preg_match_all('/->iVersion(.*)=(.*);/i', file_get_contents($pluginFilename), $result)) {
$pluginDetail = $oPluginRegistry->getPluginDetails($pluginName . '.php'); $version = trim($result[2][0], ' "');
$fileTar = $pluginHome . PATH_SEP . $pluginName . '-' . $pluginDetail->iVersion . '.tar'; } else {
$version = 1;
}
$fileTar = $pluginHome . PATH_SEP . $pluginName . '-' . $version . '.tar';
$tar = new Archive_Tar($fileTar); $tar = new Archive_Tar($fileTar);
$tar->_compress = false; $tar->_compress = false;

View File

@@ -39,8 +39,6 @@
* @link http://pear.php.net/package/Archive_Tar * @link http://pear.php.net/package/Archive_Tar
*/ */
require_once 'PEAR.php';
define('ARCHIVE_TAR_ATT_SEPARATOR', 90001); define('ARCHIVE_TAR_ATT_SEPARATOR', 90001);
define('ARCHIVE_TAR_END_BLOCK', pack("a512", '')); define('ARCHIVE_TAR_END_BLOCK', pack("a512", ''));