Merge pull request #2514
cda45a7f
Source updates are in a source subdirectory (moneromooo-monero)
This commit is contained in:
commit
a666d36ca6
2 changed files with 6 additions and 3 deletions
|
@ -1291,11 +1291,12 @@ namespace cryptonote
|
|||
bool core::check_updates()
|
||||
{
|
||||
static const char software[] = "monero";
|
||||
static const char subdir[] = "cli"; // because it can never be simple
|
||||
#ifdef BUILD_TAG
|
||||
static const char buildtag[] = BOOST_PP_STRINGIZE(BUILD_TAG);
|
||||
static const char subdir[] = "cli"; // because it can never be simple
|
||||
#else
|
||||
static const char buildtag[] = "source";
|
||||
static const char subdir[] = "source"; // because it can never be simple
|
||||
#endif
|
||||
|
||||
if (check_updates_level == UPDATES_DISABLED)
|
||||
|
|
|
@ -1560,8 +1560,10 @@ namespace cryptonote
|
|||
static const char software[] = "monero";
|
||||
#ifdef BUILD_TAG
|
||||
static const char buildtag[] = BOOST_PP_STRINGIZE(BUILD_TAG);
|
||||
static const char subdir[] = "cli";
|
||||
#else
|
||||
static const char buildtag[] = "source";
|
||||
static const char subdir[] = "source";
|
||||
#endif
|
||||
|
||||
if (req.command != "check" && req.command != "download" && req.command != "update")
|
||||
|
@ -1584,8 +1586,8 @@ namespace cryptonote
|
|||
}
|
||||
res.update = true;
|
||||
res.version = version;
|
||||
res.user_uri = tools::get_update_url(software, "cli", buildtag, version, true);
|
||||
res.auto_uri = tools::get_update_url(software, "cli", buildtag, version, false);
|
||||
res.user_uri = tools::get_update_url(software, subdir, buildtag, version, true);
|
||||
res.auto_uri = tools::get_update_url(software, subdir, buildtag, version, false);
|
||||
res.hash = hash;
|
||||
if (req.command == "check")
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue