From 46a26212b09a2987d24d6f8a73685ea390383841 Mon Sep 17 00:00:00 2001 From: Fireable <38793386+ItzFireable@users.noreply.github.com> Date: Tue, 16 May 2023 01:16:51 +0300 Subject: [PATCH] Fixes for Linux (#124) * Throw an exception instead * Change all compiler targets to follow OS, not Windows --- commandline/commands/Compiler.hx | 6 +++--- source/funkin/backend/system/framerate/SystemInfo.hx | 2 +- source/funkin/backend/utils/MemoryUtil.hx | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/commandline/commands/Compiler.hx b/commandline/commands/Compiler.hx index 24ace428..0e0eb692 100644 --- a/commandline/commands/Compiler.hx +++ b/commandline/commands/Compiler.hx @@ -5,13 +5,13 @@ class Compiler { __build(args, ["test", getBuildTarget(), "-D", "TEST_BUILD"]); } public static function build(args:Array) { - __build(args, ["build", "windows", "-D", "TEST_BUILD"]); + __build(args, ["build", getBuildTarget(), "-D", "TEST_BUILD"]); } public static function release(args:Array) { - __build(args, ["build", "windows"]); + __build(args, ["build", getBuildTarget()]); } public static function testRelease(args:Array) { - __build(args, ["test", "windows"]); + __build(args, ["test", getBuildTarget()]); } private static function __build(args:Array, arg:Array) { diff --git a/source/funkin/backend/system/framerate/SystemInfo.hx b/source/funkin/backend/system/framerate/SystemInfo.hx index 3c775623..80e35e14 100644 --- a/source/funkin/backend/system/framerate/SystemInfo.hx +++ b/source/funkin/backend/system/framerate/SystemInfo.hx @@ -31,7 +31,7 @@ class SystemInfo extends FramerateCategory { if (process.exitCode() == 0) cpuName = process.stdout.readAll().toString().trim().split(":")[1].trim(); #elseif linux var process = new HiddenProcess("cat", ["/proc/cpuinfo"]); - if (process.exitCode() != 0) return; + if (process.exitCode() != 0) throw 'Could not fetch CPU information'; for (line in process.stdout.readAll().toString().split("\n")) { if (line.indexOf("model name") == 0) { diff --git a/source/funkin/backend/utils/MemoryUtil.hx b/source/funkin/backend/utils/MemoryUtil.hx index 47f55114..4c0c40c0 100644 --- a/source/funkin/backend/utils/MemoryUtil.hx +++ b/source/funkin/backend/utils/MemoryUtil.hx @@ -128,7 +128,7 @@ class MemoryUtil { reg.match(process.stdout.readAll().toString()); if (process.exitCode() == 0) return reg.matched(1); #elseif linux - var process = HiddenProcess("sudo", ["dmidecode", "--type", "17"]); + var process = new HiddenProcess("sudo", ["dmidecode", "--type", "17"]); if (process.exitCode() != 0) return "Unknown"; var lines = process.stdout.readAll().toString().split("\n"); for (line in lines) {