mirror of
https://github.com/QuasarApp/CQtDeployer.git
synced 2025-05-08 15:39:35 +00:00
ref #661 "fix deploy icons "
This commit is contained in:
parent
bf81c108c7
commit
3f11a9d163
@ -275,7 +275,6 @@ bool iDistribution::deployIcon(const DistroModule& pkg) {
|
|||||||
auto localData = dataLocation(pkg);
|
auto localData = dataLocation(pkg);
|
||||||
const DeployConfig *cfg = DeployCore::_config;
|
const DeployConfig *cfg = DeployCore::_config;
|
||||||
|
|
||||||
QSet<QString> icons;
|
|
||||||
for (const auto& target: pkg.targets()) {
|
for (const auto& target: pkg.targets()) {
|
||||||
auto targetObject = cfg->targets().value(target);
|
auto targetObject = cfg->targets().value(target);
|
||||||
|
|
||||||
@ -292,8 +291,11 @@ bool iDistribution::deployIcon(const DistroModule& pkg) {
|
|||||||
QuasarAppUtils::Params::log(QString("%0: %1").arg(target, icon),
|
QuasarAppUtils::Params::log(QString("%0: %1").arg(target, icon),
|
||||||
QuasarAppUtils::Debug);
|
QuasarAppUtils::Debug);
|
||||||
|
|
||||||
if (icons.contains(icon))
|
if (!targetObject.fEnableRunScript()) {
|
||||||
break;
|
QuasarAppUtils::Params::log(QString("%0: %1 Ignored").arg(target, icon),
|
||||||
|
QuasarAppUtils::Debug);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
QFileInfo iconInfo(icon);
|
QFileInfo iconInfo(icon);
|
||||||
QFileInfo runScript(targetObject.getRunScriptFile());
|
QFileInfo runScript(targetObject.getRunScriptFile());
|
||||||
@ -307,8 +309,6 @@ bool iDistribution::deployIcon(const DistroModule& pkg) {
|
|||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
icons += icon;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user