RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2026-04-04 22:18:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Qt: just remove the entire .app dir on macOs

Browse source
This commit is contained in:
Megamouse 2026-01-12 18:33:01 +01:00
parent 72851d7d44
commit a0f2f006b1
1 changed files with 30 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

51
rpcs3/rpcs3qt/shortcut_utils.cpp
View file

@ -80,6 +80,8 @@ namespace gui::utils
} }
icon_file.close(); icon_file.close();
sys_log.notice("Created shortcut icon file '%s'", target_icon_path);
return true; return true;
} }
@ -241,6 +243,8 @@ namespace gui::utils
#elif defined(__APPLE__) #elif defined(__APPLE__)
fmt::append(link_path, "/%s.app", simple_name); fmt::append(link_path, "/%s.app", simple_name);
sys_log.notice("Creating shortcut '%s' with arguments '%s'", link_path, target_cli_args);
const std::string contents_dir = link_path + "/Contents/"; const std::string contents_dir = link_path + "/Contents/";
const std::string macos_dir = contents_dir + "MacOS/"; const std::string macos_dir = contents_dir + "MacOS/";
const std::string resources_dir = contents_dir + "Resources/"; const std::string resources_dir = contents_dir + "Resources/";
@ -339,6 +343,8 @@ namespace gui::utils
fmt::append(link_path, "/%s.desktop", simple_name); fmt::append(link_path, "/%s.desktop", simple_name);
sys_log.notice("Creating shortcut '%s' for '%s' with arguments '%s'", link_path, exe_path, target_cli_args);
std::string file_content; std::string file_content;
fmt::append(file_content, "[Desktop Entry]\n"); fmt::append(file_content, "[Desktop Entry]\n");
fmt::append(file_content, "Encoding=UTF-8\n"); fmt::append(file_content, "Encoding=UTF-8\n");
@ -401,17 +407,31 @@ namespace gui::utils
return; return;
} }
const auto remove_file = [](const std::string& path) const auto remove_path = [](const std::string& path, bool is_file)
{ {
if (!path.empty() && fs::is_file(path)) if (!path.empty())
{ {
if (fs::remove_file(path)) if (is_file && fs::is_file(path))
{ {
sys_log.success("Removed shortcut file '%s'", path); if (fs::remove_file(path))
{
sys_log.success("Removed shortcut file '%s'", path);
}
else
{
sys_log.error("Failed to remove shortcut file '%s': error='%s'", path, fs::g_tls_error);
}
} }
else else if (!is_file && fs::is_dir(path))
{ {
sys_log.error("Failed to remove shortcut file '%s': error='%s'", path, fs::g_tls_error); if (fs::remove_all(path))
{
sys_log.success("Removed shortcut directory '%s'", path);
}
else
{
sys_log.error("Failed to remove shortcut directory '%s': error='%s'", path, fs::g_tls_error);
}
} }
} }
}; };
@ -446,28 +466,17 @@ namespace gui::utils
#ifdef _WIN32 #ifdef _WIN32
fmt::append(link_path, "/%s.lnk", simple_name); fmt::append(link_path, "/%s.lnk", simple_name);
remove_file(link_path); remove_path(link_path, true);
#elif defined(__APPLE__) #elif defined(__APPLE__)
fmt::append(link_path, "/%s.app", simple_name); fmt::append(link_path, "/%s.app", simple_name);
remove_path(link_path, false);
const std::string contents_dir = link_path + "/Contents/";
const std::string plist_path = contents_dir + "Info.plist";
const std::string launcher_path = contents_dir + "MacOS/launcher";
const std::string resources_dir = contents_dir + "Resources";
const std::string icon_path = fmt::format("%s/shortcut.%s", resources_dir, icon_extension);
remove_file(plist_path);
remove_file(launcher_path);
remove_file(icon_path);
#else #else
fmt::append(link_path, "/%s.desktop", simple_name); fmt::append(link_path, "/%s.desktop", simple_name);
remove_file(link_path); remove_path(link_path, true);
#endif #endif
} }
#ifndef __APPLE__
const std::string icon_path = fmt::format("%sIcons/game_icons/%s/shortcut.%s", fs::get_config_dir(), serial, icon_extension); const std::string icon_path = fmt::format("%sIcons/game_icons/%s/shortcut.%s", fs::get_config_dir(), serial, icon_extension);
remove_file(icon_path); remove_path(icon_path, true);
#endif
} }
} }