Compare commits
4 Commits
1.5.0
...
0d00faf493
Author | SHA1 | Date | |
---|---|---|---|
0d00faf493 | |||
5beb235d92 | |||
a4bb993217 | |||
50357997c2 |
@@ -138,7 +138,8 @@ DEFINES += QT_DEPRECATED_WARNINGS
|
|||||||
# 1.5.0 : Use ptu-config.atb-comm.de (given in ini-file) as new server for
|
# 1.5.0 : Use ptu-config.atb-comm.de (given in ini-file) as new server for
|
||||||
# customer repositories.
|
# customer repositories.
|
||||||
# Fix: allow empty lines in opkg_commands.
|
# Fix: allow empty lines in opkg_commands.
|
||||||
VERSION="1.5.0"
|
# 1.5.1 : Fix: do not use cleanPath() on a url-address.
|
||||||
|
VERSION="1.5.1"
|
||||||
# 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.
|
||||||
# 2: Wenn der WAIT-Button aktiv ist, dann wird ein Repository repariert (neu
|
# 2: Wenn der WAIT-Button aktiv ist, dann wird ein Repository repariert (neu
|
||||||
|
@@ -74,6 +74,11 @@ int main(int argc, char *argv[]) {
|
|||||||
parser.readSettings();
|
parser.readSettings();
|
||||||
|
|
||||||
QString repositoryUrl = parser.repositoryUrl();
|
QString repositoryUrl = parser.repositoryUrl();
|
||||||
|
|
||||||
|
if (repositoryUrl.endsWith('/')) {
|
||||||
|
repositoryUrl.chop(1);
|
||||||
|
}
|
||||||
|
|
||||||
QString gitSSHCommand("");
|
QString gitSSHCommand("");
|
||||||
|
|
||||||
if (repositoryUrl.contains("ptu-config.atb-comm.de")) {
|
if (repositoryUrl.contains("ptu-config.atb-comm.de")) {
|
||||||
|
@@ -110,19 +110,19 @@ QString Utils::getTariffInfo(QString fileName) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
QString Utils::zoneName(quint8 i) {
|
QString Utils::zoneName(quint8 i) {
|
||||||
static constexpr char const *zName[] = {
|
//static constexpr char const *zName[] = {
|
||||||
"",
|
// "",
|
||||||
"purple",
|
// "purple",
|
||||||
"blue",
|
// "blue",
|
||||||
"yellow",
|
// "yellow",
|
||||||
"green",
|
// "green",
|
||||||
"yellow (mars)",
|
// "yellow (mars)",
|
||||||
"green (mars)"
|
// "green (mars)"
|
||||||
};
|
//};
|
||||||
if (i < (sizeof(zName)/sizeof(char const *))) {
|
//if (i < (sizeof(zName)/sizeof(char const *))) {
|
||||||
return zName[i];
|
// return zName[i];
|
||||||
}
|
//}
|
||||||
return "N/A";
|
return "---";
|
||||||
}
|
}
|
||||||
|
|
||||||
void Utils::printCriticalErrorMsg(QString const &errorMsg, bool upper, bool lower) {
|
void Utils::printCriticalErrorMsg(QString const &errorMsg, bool upper, bool lower) {
|
||||||
|
@@ -148,7 +148,7 @@ Worker::Worker(int customerNr,
|
|||||||
, m_pluginName(pluginName)
|
, m_pluginName(pluginName)
|
||||||
, m_workingDirectory(workingDirectory)
|
, m_workingDirectory(workingDirectory)
|
||||||
, m_branchName(branchName)
|
, m_branchName(branchName)
|
||||||
, m_customerRepositoryPath(QDir::cleanPath(QString("%1/%2.git").arg(repositoryUrl).arg(m_customerNrStr)))
|
, m_customerRepositoryPath(QString("%1/%2.git").arg(repositoryUrl).arg(m_customerNrStr))
|
||||||
, m_customerRepository(QDir::cleanPath(m_workingDirectory + QDir::separator() + m_customerNrStr))
|
, m_customerRepository(QDir::cleanPath(m_workingDirectory + QDir::separator() + m_customerNrStr))
|
||||||
, m_noUpdatePsaHardware(noUpdatePsaHardware)
|
, m_noUpdatePsaHardware(noUpdatePsaHardware)
|
||||||
, m_alwaysDownloadConfig(alwaysDownloadConfig)
|
, m_alwaysDownloadConfig(alwaysDownloadConfig)
|
||||||
|
Reference in New Issue
Block a user