From 1388c00a4e789d6b0cb0a7cc7e3f7d3e1aaa1e3a Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Fri, 23 Sep 2016 22:20:37 +0100 Subject: [PATCH] Exit with non-zero status when --list or --list-details fails --- include/downloader.h | 2 +- main.cpp | 2 +- src/downloader.cpp | 10 +++++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/include/downloader.h b/include/downloader.h index 2edb8c4..bede8fd 100644 --- a/include/downloader.h +++ b/include/downloader.h @@ -65,7 +65,7 @@ class Downloader virtual ~Downloader(); int init(); int login(); - void listGames(); + int listGames(); void updateCheck(); void repair(); void download(); diff --git a/main.cpp b/main.cpp index 360ec7f..4380152 100644 --- a/main.cpp +++ b/main.cpp @@ -571,7 +571,7 @@ int main(int argc, char *argv[]) else if (config.bDownload) // Download games downloader.download(); else if (config.bListDetails || config.bList) // Detailed list of games/extras - downloader.listGames(); + res = downloader.listGames(); else if (!config.sOrphanRegex.empty()) // Check for orphaned files if regex for orphans is set downloader.checkOrphans(); else if (config.bCheckStatus) diff --git a/src/downloader.cpp b/src/downloader.cpp index 0e97ba0..f7eeb04 100644 --- a/src/downloader.cpp +++ b/src/downloader.cpp @@ -495,12 +495,15 @@ int Downloader::getGameDetails() return 0; } -void Downloader::listGames() +int Downloader::listGames() { if (config.bListDetails) // Detailed list { - if (this->games.empty()) - this->getGameDetails(); + if (this->games.empty()) { + int res = this->getGameDetails(); + if (res > 0) + return res; + } for (unsigned int i = 0; i < games.size(); ++i) { @@ -696,6 +699,7 @@ void Downloader::listGames() } } + return 0; } void Downloader::repair()