QuasarApp/installer-framework
4
0
Fork 0
mirror of https://github.com/QuasarApp/installer-framework.git synced 2025-05-21 17:19:34 +00:00
Code Issues Projects Releases Wiki Activity

Let the app parse the arguments again in gui mode.

Browse Source 
Also do not stop on unknown arguments, this is rather stupid
to do, just print the error message. Might fix a problem on
OSX with session id...

Change-Id: I9ca6903b0073ea54b398534c5273f7f0f2e50db4
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
This commit is contained in:
kh1 2011-11-25 16:05:08 +01:00 committed by Niels Weber
parent 5e926ed086
commit a56fdc2bc3
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
installerbuilder/installerbase/installerbase.cpp
View File

@ -89,7 +89,7 @@ int main(int argc, char *argv[])
const KDSelfRestarter restarter(argc, argv); const KDSelfRestarter restarter(argc, argv);
KDRunOnceChecker runCheck(QLatin1String("lockmyApp1234865.lock")); KDRunOnceChecker runCheck(QLatin1String("lockmyApp1234865.lock"));
const QStringList args = QInstaller::parseCommandLineArgs(argc, argv); QStringList args = QInstaller::parseCommandLineArgs(argc, argv);
try { try {
if (args.contains(QLatin1String("--version"))) { if (args.contains(QLatin1String("--version"))) {
InstallerBase::showVersion(QLatin1String(VERSION)); InstallerBase::showVersion(QLatin1String(VERSION));
@ -147,6 +147,7 @@ int main(int argc, char *argv[])
// from here, the "normal" installer binary is running // from here, the "normal" installer binary is running
MyApplication app(argc, argv); MyApplication app(argc, argv);
args = app.arguments();
if (runCheck.isRunning(KDRunOnceChecker::ProcessList)) { if (runCheck.isRunning(KDRunOnceChecker::ProcessList)) {
if (runCheck.isRunning(KDRunOnceChecker::Lockfile)) if (runCheck.isRunning(KDRunOnceChecker::Lockfile))
@ -278,8 +279,6 @@ int main(int argc, char *argv[])
PackageManagerCore::setNoForceInstallation(true); PackageManagerCore::setNoForceInstallation(true);
} else { } else {
std::cerr << "Unknown option: " << argument << std::endl; std::cerr << "Unknown option: " << argument << std::endl;
InstallerBase::showUsage();
return PackageManagerCore::Failure;
} }
} }