Skip to content

Commit d445569

Browse files
@JamesHeinrich version build for #25 Update Json builder JSON os should be a top-level key, not inside program
1 parent 58ecf79 commit d445569

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

include/core/Version.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include <string>
55

66
namespace core {
7-
const std::string PRMERS_VERSION = "4.15.48-alpha";
7+
const std::string PRMERS_VERSION = "4.15.49-alpha";
88
} // namespace core
99

1010
#endif // VERSION_HPP

src/io/JsonBuilder.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -288,12 +288,12 @@ static std::string generatePrimeNetJson(
288288
oss << ",\"program\":{"
289289
<< "\"name\":\"prmers\""
290290
<< ",\"version\":" << jsonEscape(core::PRMERS_VERSION)
291-
<< ",\"port\":" << opts.portCode
291+
<< ",\"port\":" << programPort
292292
<< "}"; // close "program"
293293
oss << ",\"os\":{"
294-
<< "\"os\":" << jsonEscape(opts.osName);
295-
if (!opts.osArch.empty() && (opts.osArch != "unknown")) {
296-
oss << ",\"architecture\":" << jsonEscape(opts.osArch);
294+
<< "\"os\":" << jsonEscape(osName);
295+
if (!osArchitecture.empty() && (osArchitecture != "unknown")) {
296+
oss << ",\"architecture\":" << jsonEscape(osArchitecture);
297297
}
298298
oss << "}"; // close "os"
299299
if (!user.empty()) oss << ",\"user\":" << jsonEscape(user);

0 commit comments

Comments
 (0)