Compare commits

...

2 Commits

2 changed files with 11 additions and 11 deletions

View File

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

View File

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