|
@@ -174,29 +174,29 @@ class PackageClass
|
|
|
|
|
|
$moduleFiles = $packageInfo['helper']['module-files'];
|
|
|
if(! $moduleFiles){
|
|
|
- logInfo($repoName,'no module files defined. skip.');
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
foreach($moduleFiles as $fileInfo){
|
|
|
$fileName = $fileInfo['name'];
|
|
|
- printf("[%s] fetching file -- %s\n",$repoName,$fileName);
|
|
|
+ logInfo($repoName,"fetching module file -- ",$fileName);
|
|
|
|
|
|
//下载文件到缓存区
|
|
|
$filePath = downloadToDir($ossHost,$repoName,$version,$fileName,$cacheDir);
|
|
|
if(! $filePath ){
|
|
|
- printf("[%s] fetch file failed -- %s\n",$repoName,$fileName);
|
|
|
- continue;
|
|
|
+ logError($repoName,"fetch module file failed",$fileName);
|
|
|
+ return false;
|
|
|
}
|
|
|
|
|
|
// 解压文件
|
|
|
if( isZipFile($fileName) ){
|
|
|
if(! unzipFile($filePath,$moduleDir)) {
|
|
|
- printf("[%s] unzip file failed -- %s\n ",$repoName,$fileName);
|
|
|
- unlink($filePath);
|
|
|
+ logError($repoName,"unzip module file failed",$fileName);
|
|
|
+ return false;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ return true;
|
|
|
}
|
|
|
|
|
|
//下载包common文件
|
|
@@ -209,27 +209,27 @@ class PackageClass
|
|
|
$ossHost = $packageInfo['ossHost'];
|
|
|
$commonFiles = $packageInfo['helper']['common-files'];
|
|
|
if(! $commonFiles){
|
|
|
- logInfo($repoName,'no common files defined. skip.');
|
|
|
return;
|
|
|
}
|
|
|
foreach($commonFiles as $fileInfo){
|
|
|
$fileName = $fileInfo['name'];
|
|
|
- printf("[%s] fetching common file -- %s\n",$repoName,$fileName);
|
|
|
+ logInfo($repoName,"fetching common file -- ",$fileName);
|
|
|
//下载文件到缓存区
|
|
|
$filePath = downloadToDir($ossHost,$repoName,$version,$fileName,$cacheDir);
|
|
|
if(! $filePath ){
|
|
|
- printf("[%s] fetch common file failed -- %s\n",$repoName,$fileName);
|
|
|
+ logError($repoName,"fetch common file failed",$fileName);
|
|
|
continue;
|
|
|
}
|
|
|
|
|
|
// 解压文件
|
|
|
if( isZipFile($fileName) ){
|
|
|
if(! unzipFile($filePath,$commonDir)) {
|
|
|
- printf("[%s] unzip common file failed -- %s\n ",$repoName,$fileName);
|
|
|
- unlink($filePath);
|
|
|
+ logError($repoName,"unzip common file failed",$fileName);
|
|
|
+ return false;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ return true;
|
|
|
}
|
|
|
|
|
|
//下载包config文件
|
|
@@ -247,22 +247,9 @@ class PackageClass
|
|
|
}
|
|
|
foreach($configFiles as $fileInfo){
|
|
|
$fileName = $fileInfo['name'];
|
|
|
- printf("[%s] fetching config file -- %s\n",$repoName,$fileName);
|
|
|
- //下载文件到缓存区
|
|
|
- $filePath = downloadToDir($ossHost,$repoName,$version,$fileName,$cacheDir);
|
|
|
- if(! $filePath ){
|
|
|
- printf("[%s] fetch config file failed -- %s\n",$repoName,$fileName);
|
|
|
- continue;
|
|
|
- }
|
|
|
-
|
|
|
- // 解压文件
|
|
|
- if( isZipFile($fileName) ){
|
|
|
- if(! unzipFile($filePath,$configDir)) {
|
|
|
- printf("[%s] unzip config file failed -- %s\n ",$repoName,$fileName);
|
|
|
- unlink($filePath);
|
|
|
- }
|
|
|
- }
|
|
|
+
|
|
|
}
|
|
|
+ return true;
|
|
|
}
|
|
|
|
|
|
private static function registerPath($packageInfo)
|