imports/imhex
1
0
Fork 0
mirror of https://github.com/WerWolv/ImHex.git synced 2026-03-27 23:37:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: Issues when running the updater on Linux

Browse Source
This commit is contained in:
WerWolv
2025-08-11 17:44:49 +02:00
parent 43da36a957
commit ad2a36676c
4 changed files with 42 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libimhex/include/hex/helpers/utils.hpp
View File

@@ -98,7 +98,7 @@ namespace hex {
[[nodiscard]] std::string toByteString(u64 bytes);
[[nodiscard]] std::string makePrintable(u8 c);
void startProgram(const std::string &command);
void startProgram(const std::vector<std::string> &command);
int executeCommand(const std::string &command);
void openWebpage(std::string url);

7
lib/libimhex/source/api/imhex_api.cpp
View File

@@ -1048,12 +1048,7 @@ namespace hex {
}
EventImHexClosing::subscribe([executablePath, updateTypeString] {
hex::startProgram(
fmt::format("\"{}\" \"{}\"",
wolv::util::toUTF8String(executablePath),
updateTypeString
)
);
hex::startProgram({ wolv::util::toUTF8String(executablePath), updateTypeString });
});
ImHexApi::System::closeImHex();

49
lib/libimhex/source/helpers/utils.cpp
View File

@@ -302,17 +302,18 @@ namespace hex {
return std::to_string(value).substr(0, 5) + Suffixes[suffixIndex];
}
void startProgram(const std::string &command) {
#if defined(OS_WINDOWS)
std::ignore = system(fmt::format("start \"\" {0}", command).c_str());
#elif defined(OS_MACOS)
std::ignore = system(fmt::format("{0}", command).c_str());
#elif defined(OS_LINUX)
executeCmd({"xdg-open", command});
#elif defined(OS_WEB)
std::ignore = command;
#endif
void startProgram(const std::vector<std::string> &command) {
#if defined(OS_WINDOWS)
std::ignore = system(fmt::format("start \"\" {0:?}", fmt::join(command, " ")).c_str());
#elif defined(OS_MACOS)
std::ignore = system(fmt::format("{0:?}", fmt::join(command, " ")).c_str());
#elif defined(OS_LINUX)
std::vector<std::string> xdgCommand = { "xdg-open" };
xdgCommand.insert(xdgCommand.end(), command.begin(), command.end());
executeCmd(xdgCommand);
#elif defined(OS_WEB)
std::ignore = command;
#endif
}
int executeCommand(const std::string &command) {
@@ -323,19 +324,19 @@ namespace hex {
if (!url.contains("://"))
url = "https://" + url;
#if defined(OS_WINDOWS)
ShellExecuteA(nullptr, "open", url.c_str(), nullptr, nullptr, SW_SHOWNORMAL);
#elif defined(OS_MACOS)
openWebpageMacos(url.c_str());
#elif defined(OS_LINUX)
executeCmd({"xdg-open", url});
#elif defined(OS_WEB)
EM_ASM({
window.open(UTF8ToString($0), '_blank');
}, url.c_str());
#else
#warning "Unknown OS, can't open webpages"
#endif
#if defined(OS_WINDOWS)
ShellExecuteA(nullptr, "open", url.c_str(), nullptr, nullptr, SW_SHOWNORMAL);
#elif defined(OS_MACOS)
openWebpageMacos(url.c_str());
#elif defined(OS_LINUX)
executeCmd({ "xdg-open", url });
#elif defined(OS_WEB)
EM_ASM({
window.open(UTF8ToString($0), '_blank');
}, url.c_str());
#else
#warning "Unknown OS, can't open webpages"
#endif
}
std::optional<u8> hexCharToValue(char c) {