|
@@ -32,26 +32,38 @@ class PackageClass
|
|
|
self::setProgressStep1(100);
|
|
|
|
|
|
//逐个依赖仓库操作
|
|
|
- self::postUpdateVendorPkgs($vendorDir,$vendorPkgs);
|
|
|
+ if(! self::postUpdateVendorPkgs($vendorDir,$vendorPkgs) ){
|
|
|
+ return false;
|
|
|
+ }
|
|
|
|
|
|
//顶层仓库操作
|
|
|
- self::postUpdateRootPkg($vendorDir,$rootPkg);
|
|
|
+ if(! self::postUpdateRootPkg($vendorDir,$rootPkg) ){
|
|
|
+ return false;
|
|
|
+ }
|
|
|
|
|
|
//全部操作完毕
|
|
|
self::setProgressOK(true);
|
|
|
+
|
|
|
+ return true;
|
|
|
}
|
|
|
private static function upgrade($vendorDir,$rootPkg,$vendorPkgs){
|
|
|
//依赖库都已下载,默认先给个进度
|
|
|
self::setProgressStep1(100);
|
|
|
|
|
|
//逐个依赖仓库操作
|
|
|
- self::postUpdateVendorPkgs($vendorDir,$vendorPkgs);
|
|
|
+ if(! self::postUpdateVendorPkgs($vendorDir,$vendorPkgs) ){
|
|
|
+ return false;
|
|
|
+ }
|
|
|
|
|
|
//顶层仓库操作
|
|
|
- self::postUpdateRootPkg($vendorDir,$rootPkg);
|
|
|
+ if(! self::postUpdateRootPkg($vendorDir,$rootPkg) ){
|
|
|
+ return false;
|
|
|
+ }
|
|
|
|
|
|
//全部操作完毕
|
|
|
self::setProgressOK(true);
|
|
|
+
|
|
|
+ return true;
|
|
|
}
|
|
|
/*
|
|
|
private static function createModuleIni($vendorDir,$vendorPkgs)
|
|
@@ -103,6 +115,7 @@ class PackageClass
|
|
|
//self::copyConfigFiles($packageInfo);
|
|
|
self::setProgressStep2($count,$i,3);
|
|
|
}
|
|
|
+ return true;
|
|
|
}
|
|
|
private static function postUpdateRootPkg($vendorDir,$pkg)
|
|
|
{
|
|
@@ -111,16 +124,21 @@ class PackageClass
|
|
|
$packageInfo = self::getPackageInfo($vendorDir,$repoDir,$pkg);
|
|
|
|
|
|
//拷贝copy-files文件
|
|
|
- self::copyFiles($packageInfo);
|
|
|
+ if(! self::copyFiles($packageInfo) ){
|
|
|
+ return false;
|
|
|
+ }
|
|
|
|
|
|
//替换文件内的宏变量
|
|
|
- self::macoFiles($packageInfo);
|
|
|
+ if(! self::macoFiles($packageInfo) ){
|
|
|
+ return false;
|
|
|
+ }
|
|
|
|
|
|
//注册全局路径
|
|
|
self::registerPath($packageInfo);
|
|
|
|
|
|
//注册自启动程序
|
|
|
self::registerAutorun($packageInfo);
|
|
|
+ return true;
|
|
|
|
|
|
}
|
|
|
//初始化
|