mirror of
https://github.com/QuasarApp/installer-framework.git
synced 2025-05-21 17:19:34 +00:00
Let the app parse the arguments again in gui mode.
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:
parent
5e926ed086
commit
a56fdc2bc3
@ -89,7 +89,7 @@ int main(int argc, char *argv[])
|
||||
const KDSelfRestarter restarter(argc, argv);
|
||||
KDRunOnceChecker runCheck(QLatin1String("lockmyApp1234865.lock"));
|
||||
|
||||
const QStringList args = QInstaller::parseCommandLineArgs(argc, argv);
|
||||
QStringList args = QInstaller::parseCommandLineArgs(argc, argv);
|
||||
try {
|
||||
if (args.contains(QLatin1String("--version"))) {
|
||||
InstallerBase::showVersion(QLatin1String(VERSION));
|
||||
@ -147,6 +147,7 @@ int main(int argc, char *argv[])
|
||||
|
||||
// from here, the "normal" installer binary is running
|
||||
MyApplication app(argc, argv);
|
||||
args = app.arguments();
|
||||
|
||||
if (runCheck.isRunning(KDRunOnceChecker::ProcessList)) {
|
||||
if (runCheck.isRunning(KDRunOnceChecker::Lockfile))
|
||||
@ -278,8 +279,6 @@ int main(int argc, char *argv[])
|
||||
PackageManagerCore::setNoForceInstallation(true);
|
||||
} else {
|
||||
std::cerr << "Unknown option: " << argument << std::endl;
|
||||
InstallerBase::showUsage();
|
||||
return PackageManagerCore::Failure;
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user