OnDemandUpdatePTU.pro

@@ -61,8 +61,7 @@ DEFINES += QT_DEPRECATED_WARNINGS
 #           own event-loop (so it cannot block anything inside the CA-plugin).
 # 1.3.16:   Bug fixes found during testing.
 VERSION="1.3.17"
-#           Add ATBUpdateTool.ini and custom command line parser. Settings
+#           Add ATBUpdateTool.ini and custom command line parser.
-#           given in ATBUpdateTool.ini can be overwritten on the command-line.
 
 # PLANNED TODOS:
 #   1:  Das Repository wird repariert bwz. neu geklont. Unabhaengig vom WAIT.

commandline_parser.cpp

@@ -144,63 +144,64 @@ void CommandLineParser::readSettings() {
 }
 
 QString CommandLineParser::repositoryUrl() {
-    if (m_parser.isSet(m_repositoryUrlOption)) {
+    return m_repositoryUrl;
+    if (m_repositoryUrl.isEmpty()) {
         m_repositoryUrl = m_parser.value(m_repositoryUrlOption);
     }
     return m_repositoryUrl;
 }
 
 QString CommandLineParser::plugInDir() {
-    if (m_parser.isSet(m_pluginDirectoryOption)) {
+    if (m_plugInDir.isEmpty()) {
         m_plugInDir = m_parser.value(m_pluginDirectoryOption);
     }
     return m_plugInDir;
 }
 
 QString CommandLineParser::plugInName() {
-    if (m_parser.isSet(m_pluginNameOption)) {
+    if (m_plugInName.isEmpty()) {
         m_plugInName = m_parser.value(m_pluginNameOption);
     }
     return m_plugInName;
 }
 
 QString CommandLineParser::workingDir() {
-    if (m_parser.isSet(m_workingDirectoryOption)) {
+    if (m_workingDir.isEmpty()) {
         m_workingDir = m_parser.value(m_workingDirectoryOption);
     }
     return m_workingDir;
 }
 
 bool CommandLineParser::dryRun() {
-    if (m_parser.isSet(m_dryRunOption)) {
+    if (m_dryRun.isEmpty()) {
         m_dryRun = m_parser.value(m_dryRunOption);
     }
     return m_dryRun == "false" ? false : true;
 }
 
 bool CommandLineParser::noUpdatePsaHardware() {
-    if (m_parser.isSet(m_noDownloadOption)) {
+    if (m_noUpdatePsaHardware.isEmpty()) {
         m_noUpdatePsaHardware = m_parser.value(m_noDownloadOption);
     }
     return m_noUpdatePsaHardware == "false" ? false : true;
 }
 
 bool CommandLineParser::yoctoVersion() {
-    if (m_parser.isSet(m_yoctoVersionOption)) {
+    if (m_showYoctoVersion.isEmpty()) {
         m_showYoctoVersion = m_parser.value(m_yoctoVersionOption);
     }
     return m_showYoctoVersion == "false" ? false : true;
 }
 
 bool CommandLineParser::yoctoInstallStatus() {
-    if (m_parser.isSet(m_yoctoInstallStatusOption)) {
+    if (m_showYoctoInstallStatus.isEmpty()) {
         m_showYoctoInstallStatus = m_parser.value(m_yoctoInstallStatusOption);
     }
     return m_showYoctoInstallStatus == "false" ? false : true;
 }
 
 bool CommandLineParser::extendedVersion() {
-    if (m_parser.isSet(m_extendedVersionOption)) {
+    if (m_showExtendedVersion.isEmpty()) {
         m_showExtendedVersion = m_parser.value(m_extendedVersionOption);
     }
     return m_showExtendedVersion == "false" ? false : true;