smallsolar
/
libkiwix
mirror of https://github.com/kiwix/libkiwix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #181 from kiwix/fix_aria2c_launch 

Correctly run aria2c when packaged with kiwix-desktop in appimage.
This commit is contained in:
Matthieu Gautier 2018-11-12 14:41:57 +01:00 committed by GitHub
parent be6f96adc0 4b9692bbd5
commit 84e831eae9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/aria2.cpp
View File

@ -9,6 +9,13 @@
#include <common/pathTools.h> #include <common/pathTools.h>
#include <downloader.h> // For AriaError #include <downloader.h> // For AriaError
#ifdef _WIN32
# define ARIA2_CMD "aria2c.exe"
#else
# define ARIA2_CMD "aria2c"
#endif
namespace kiwix { namespace kiwix {
Aria2::Aria2(): Aria2::Aria2():
@ -36,11 +43,16 @@ Aria2::Aria2():
std::string rpc_secret = "--rpc-secret=" + m_secret; std::string rpc_secret = "--rpc-secret=" + m_secret;
m_secret = "token:"+m_secret; m_secret = "token:"+m_secret;
#ifdef _WIN32 std::string aria2cmd = appendToDirectory(
callCmd.push_back("aria2c.exe"); removeLastPathElement(getExecutablePath()),
#else ARIA2_CMD);
callCmd.push_back("aria2c"); if (fileExists(aria2cmd)) {
#endif // A local aria2c exe exists (packaged with kiwix-desktop), use it.
callCmd.push_back(aria2cmd.c_str());
} else {
// Try to use a potential installed aria2c.
callCmd.push_back(ARIA2_CMD);
}
callCmd.push_back("--enable-rpc"); callCmd.push_back("--enable-rpc");
callCmd.push_back(rpc_secret.c_str()); callCmd.push_back(rpc_secret.c_str());
callCmd.push_back(rpc_port.c_str()); callCmd.push_back(rpc_port.c_str());