QuasarApp/CQtDeployer
4
1
Fork 0
mirror of https://github.com/QuasarApp/CQtDeployer.git synced 2025-05-03 13:09:34 +00:00
Code Issues Projects Releases Wiki Activity

added support system-backup

Browse Source
This commit is contained in:
Andrei Yankovich 2020-07-29 18:12:55 +03:00
parent e1605262ba
commit 8b09f9cfbe
5 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Deploy/configparser.cpp
View File

@ -1182,9 +1182,9 @@ iDistribution *ConfigParser::getDistribution() {
void ConfigParser::initEnvirement() {
QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
auto path = env.value("PATH");
if (!DeployCore::isSnap()) {
auto path = env.value("PATH");
_config.envirement.addEnv(env.value("LD_LIBRARY_PATH"));
_config.envirement.addEnv(path);
@ -1216,15 +1216,27 @@ bool ConfigParser::checkSnapPermisions() {
if (!DeployCore::isSnap())
return true;
if (QuasarAppUtils::Params::isEndable("deploySystem") &&
!QFile::exists(DeployCore::snapRootFS() + "/usr/lib")) {
QuasarAppUtils::Params::log("You use option deploySystem, but not added permision system-backup for cqtdeployer."
bool system = QuasarAppUtils::Params::isEndable("deploySystem") ||
QuasarAppUtils::Params::isEndable("extraLibs");
bool checkPath = QDir(DeployCore::snapRootFS()).entryList(QDir::AllEntries | QDir::NoDotAndDotDot).size();
if (system && !checkPath) {
QuasarAppUtils::Params::log("You use a deploySystem or extraLibs options,"
" but not added permision system-backup for cqtdeployer."
" Please add permision system-backup befor usong cqtdeployer."
" Add system-backup permision from console: "
"'snap connect cqtdeployer:system-backup :system-backup'"
""
" Add system-backup permision from console: ",
QuasarAppUtils::Error);
QuasarAppUtils::Params::log(
"'snap connect cqtdeployer:system-backup :system-backup'",
QuasarAppUtils::Info);
QuasarAppUtils::Params::log(
"GUI: Open the gnome system setting >> Applications >> CQtDeployer. "
"in menu rights and permisions enable system-backup.");
"in menu rights and permisions enable system-backup.",
QuasarAppUtils::Info);
return false;
}

2
Deploy/dependenciesscanner.cpp
View File

@ -99,7 +99,7 @@ bool DependenciesScanner::fillLibInfo(LibInfo &info, const QString &file) const
void DependenciesScanner::recursiveDep(LibInfo &lib, QSet<LibInfo> &res, QSet<QString>& libStack) {
QuasarAppUtils::Params::log("get recursive dependencies of " + lib.fullPath(),
QuasarAppUtils::Info);
QuasarAppUtils::Debug);
if (_scanedLibs.contains(lib.fullPath())) {
auto scanedLib = _scanedLibs.value(lib.fullPath());

4
Deploy/deploycore.cpp
View File

@ -103,12 +103,12 @@ DeployCore::QtModule DeployCore::getQtModule(const QString& path) {
void DeployCore::addQtModule(DeployCore::QtModule &module, const QString &path) {
QuasarAppUtils::Params::log("current module " + QString::number(module),
QuasarAppUtils::Info);
QuasarAppUtils::Debug);
auto mod = getQtModule(path);
QuasarAppUtils::Params::log("add new module from path " + path +
" module value " + QString::number(mod),
QuasarAppUtils::Info);
QuasarAppUtils::Debug);
module = static_cast<DeployCore::QtModule>(

2
Deploy/extracter.cpp
View File

@ -307,7 +307,7 @@ void Extracter::extractLib(const QString &file,
assert(depMap);
QuasarAppUtils::Params::log("extract lib :" + file,
QuasarAppUtils::Info);
QuasarAppUtils::Debug);
auto data = _scaner->scan(file);

6
Deploy/filemanager.cpp
View File

@ -305,7 +305,7 @@ bool FileManager::copyFolder(const QString &from, const QString &to, const QStri
if (!skipFilter.isEmpty()) {
QuasarAppUtils::Params::log(
item.absoluteFilePath() + " ignored by filter " + skipFilter,
QuasarAppUtils::VerboseLvl::Info);
QuasarAppUtils::VerboseLvl::Debug);
continue;
}
auto config = DeployCore::_config;
@ -319,7 +319,7 @@ bool FileManager::copyFolder(const QString &from, const QString &to, const QStri
if (auto rule = config->ignoreList.isIgnore(info)) {
QuasarAppUtils::Params::log(
item.absoluteFilePath() + " ignored by rule " + rule->label,
QuasarAppUtils::VerboseLvl::Info);
QuasarAppUtils::VerboseLvl::Debug);
continue;
}
@ -461,7 +461,7 @@ bool FileManager::copyFiles(const QStringList &source,
if (!skipFilter.isEmpty()) {
QuasarAppUtils::Params::log(
info.absoluteFilePath() + " ignored by filter " + skipFilter,
QuasarAppUtils::VerboseLvl::Info);
QuasarAppUtils::VerboseLvl::Debug);
continue;
}
auto config = DeployCore::_config;