Skip to content

Commit

Permalink
Variable naming improvement
Browse files Browse the repository at this point in the history
  • Loading branch information
omergoktas committed Nov 10, 2023
1 parent 4dfed14 commit 2f6c106
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ int main(int argc, char* argv[])
bool plugins = true;
bool appimage = false;
extern bool runStripEnabled;
extern bool bundleAllButCoreLibs;
extern bool bundleAllButBlacklistedLibs;
extern bool bundleEverything;
extern bool fhsLikeMode;
extern QString fhsPrefix;
Expand Down Expand Up @@ -76,7 +76,7 @@ int main(int argc, char* argv[])
} else if (argument == QByteArray("-appimage")) {
LogDebug() << "Argument found:" << argument;
appimage = true;
bundleAllButCoreLibs = true;
bundleAllButBlacklistedLibs = true;
} else if (argument == QByteArray("-bundle-everything")) {
LogDebug() << "Argument found:" << argument;
bundleEverything = true;
Expand All @@ -85,7 +85,7 @@ int main(int argc, char* argv[])
runStripEnabled = false;
} else if (argument == QByteArray("-bundle-non-qt-libs")) {
LogDebug() << "Argument found:" << argument;
bundleAllButCoreLibs = true;
bundleAllButBlacklistedLibs = true;
} else if (argument.startsWith(QByteArray("-verbose"))) {
LogDebug() << "Argument found:" << argument;
int index = argument.indexOf("=");
Expand Down
4 changes: 2 additions & 2 deletions shared.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ QStringList excludedLibraries {
};
QString appBinaryPath;
bool runStripEnabled = true;
bool bundleAllButCoreLibs = false;
bool bundleAllButBlacklistedLibs = false;
bool bundleEverything = false;
bool fhsLikeMode = false;
QString fhsPrefix;
Expand Down Expand Up @@ -470,7 +470,7 @@ LibraryInfo parseLddLibraryLine(const QString &line, const QString &appDirPath,
return info;

if(!bundleEverything) {
if(bundleAllButCoreLibs) {
if(bundleAllButBlacklistedLibs) {
/*
Bundle every lib including the low-level ones except those that are explicitly blacklisted.
This is more suitable for bundling in a way that is portable between different distributions and target systems.
Expand Down
2 changes: 1 addition & 1 deletion shared.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ extern int logLevel;

extern QString appBinaryPath;
extern bool runStripEnabled;
extern bool bundleAllButCoreLibs;
extern bool bundleAllButBlacklistedLibs;
extern bool bundleEverything;
extern bool fhsLikeMode;
extern QString fhsPrefix;
Expand Down

0 comments on commit 2f6c106

Please sign in to comment.