lee/gsmartcontrol
1
0
Fork 0
mirror of https://github.com/ashaduri/gsmartcontrol.git synced 2026-09-26 05:45:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed running "Update smartctl database" on Windows; use argv on all platforms so it is more secure.

Browse Source
This commit is contained in:
Alexander Shaduri
2024-11-05 14:53:19 +04:00
parent 7fd43bba2c
commit 99bf00d27c
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/gsc_main_window.cpp
+16 -11
View File
@@ -955,21 +955,26 @@ void GscMainWindow::run_update_drivedb()
return;
}
hz::fs::path update_binary_path = hz::fs_path_from_string("update-smart-drivedb");
if constexpr (BuildEnv::is_kernel_family_windows()) {
update_binary_path += ".ps1";
}
if (smartctl_binary.is_absolute()) {
update_binary_path = smartctl_binary.parent_path() / update_binary_path;
}
std::string update_binary = hz::fs_path_to_string(update_binary_path);
std::vector<std::string> argv;
if constexpr(!BuildEnv::is_kernel_family_windows()) { // X11
update_binary = "xterm -hold -e " + update_binary;
if constexpr (BuildEnv::is_kernel_family_windows()) {
hz::fs::path update_binary_path = hz::fs_path_from_string("update-smart-drivedb.ps1");
if (smartctl_binary.is_absolute()) {
update_binary_path = smartctl_binary.parent_path() / update_binary_path;
}
argv = {"powershell.exe", "-ExecutionPolicy", "Bypass", "-File", hz::fs_path_to_string(update_binary_path)};
} else { // X11
// TODO Wayland
hz::fs::path update_binary_path = hz::fs_path_from_string("update-smart-drivedb");
if (smartctl_binary.is_absolute()) {
update_binary_path = smartctl_binary.parent_path() / update_binary_path;
}
argv = {"xterm", "-hold", "-e", hz::fs_path_to_string(update_binary_path)};
}
try {
Glib::spawn_command_line_async(update_binary);
Glib::spawn_async(Glib::get_current_dir(), argv, Glib::SPAWN_SEARCH_PATH);
}
catch(Glib::Error& e) {
gui_show_error_dialog(_("Error Updating Drive Database"), e.what(), this);