From 241ec0f395823c4c886fc4929676d4a22d849611 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Tue, 28 Oct 2025 17:42:19 +0600 Subject: [PATCH] Test fix for saving --- source/ubinstall-gtk-bootloader.c | 2 +- source/ubinstall-gtk-components.c | 10 +++++----- source/ubinstall-gtk-grub.c | 4 ++-- source/ubinstall-gtk-installation.c | 6 +++--- source/ubinstall-gtk-keyboard.c | 2 +- source/ubinstall-gtk-network.c | 2 +- source/ubinstall-gtk-page-switch.c | 2 ++ source/ubinstall-gtk-region.c | 2 +- source/ubinstall-gtk-separate.c | 2 +- source/ubinstall-gtk-startup-services.c | 2 +- source/ubinstall-gtk-users.c | 2 +- source/ubinstall-gtk.c | 1 - 12 files changed, 19 insertions(+), 18 deletions(-) diff --git a/source/ubinstall-gtk-bootloader.c b/source/ubinstall-gtk-bootloader.c index da860f5..1dc3111 100644 --- a/source/ubinstall-gtk-bootloader.c +++ b/source/ubinstall-gtk-bootloader.c @@ -51,7 +51,7 @@ int yon_bootloader_save(main_window *widgets){ if (parameters){ char *command_parameters = yon_char_parsed_to_string(parameters,save_size," -- "); char *command = yon_char_unite(ubconfig_dull_command,"--target system ",command_parameters,NULL); - if (!system(command)){} + if (!system(yon_debug_output("%s\n",command))){} free(command); yon_char_parsed_free(parameters,save_size); } diff --git a/source/ubinstall-gtk-components.c b/source/ubinstall-gtk-components.c index e12014d..f3165f4 100644 --- a/source/ubinstall-gtk-components.c +++ b/source/ubinstall-gtk-components.c @@ -33,7 +33,7 @@ int yon_kernel_save(main_window *widgets){ if (parameters){ char *command_parameters = yon_char_parsed_to_string(parameters,size," -- "); char *command = yon_char_unite(ubconfig_dull_command,"--target system ",command_parameters,NULL); - if (!system(command)){} + if (!system(yon_debug_output("%s\n",command))){} free(command); yon_char_parsed_free(parameters,size); } @@ -67,7 +67,7 @@ int yon_kernel_addon_save(main_window *widgets){ if (parameters){ char *command_parameters = yon_char_parsed_to_string(parameters,size," -- "); char *command = yon_char_unite(ubconfig_dull_command,"--target system ",command_parameters,NULL); - if (!system(command)){} + if (!system(yon_debug_output("%s\n",command))){} free(command); yon_char_parsed_free(parameters,size); } @@ -101,7 +101,7 @@ int yon_os_components_save(main_window *widgets){ if (parameters){ char *command_parameters = yon_char_parsed_to_string(parameters,parameters_size," -- "); char *command = yon_char_unite(ubconfig_dull_command,"--target system ",command_parameters,NULL); - if (!system(command)){} + if (!system(yon_debug_output("%s\n",command))){} free(command); yon_char_parsed_free(parameters,parameters_size); } @@ -248,7 +248,7 @@ int yon_software_save(main_window *widgets){ if (parameters){ char *command_parameters = yon_char_parsed_to_string(parameters,size," -- "); char *command = yon_char_unite(ubconfig_dull_command,"--target system ",command_parameters,NULL); - if (!system(command)){} + if (!system(yon_debug_output("%s\n",command))){} free(command); yon_char_parsed_free(parameters,size); } @@ -313,7 +313,7 @@ int yon_pacman_software_save(main_window *widgets){ if (parameters){ char *command_parameters = yon_char_parsed_to_string(parameters,size," -- "); char *command = yon_char_unite(ubconfig_dull_command,"--target system ",command_parameters,NULL); - if (!system(command)){} + if (!system(yon_debug_output("%s\n",command))){} free(command); yon_char_parsed_free(parameters,size); } diff --git a/source/ubinstall-gtk-grub.c b/source/ubinstall-gtk-grub.c index 2d65341..749f496 100644 --- a/source/ubinstall-gtk-grub.c +++ b/source/ubinstall-gtk-grub.c @@ -26,7 +26,7 @@ int yon_grub_install_save(main_window *widgets){ if (parameters){ char *command_parameters = yon_char_parsed_to_string(parameters,size," -- "); char *command = yon_char_unite(ubconfig_dull_command,"--target system ",command_parameters,NULL); - if (!system(command)){} + if (!system(yon_debug_output("%s\n",command))){} free(command); yon_char_parsed_free(parameters,size); } @@ -60,7 +60,7 @@ int yon_grub_update_save(main_window *widgets){ if (parameters){ char *command_parameters = yon_char_parsed_to_string(parameters,size," -- "); char *command = yon_char_unite(ubconfig_dull_command,"--target system ",command_parameters,NULL); - if (!system(command)){} + if (!system(yon_debug_output("%s\n",command))){} free(command); yon_char_parsed_free(parameters,size); } diff --git a/source/ubinstall-gtk-installation.c b/source/ubinstall-gtk-installation.c index ce9c789..15a1863 100644 --- a/source/ubinstall-gtk-installation.c +++ b/source/ubinstall-gtk-installation.c @@ -35,7 +35,7 @@ int yon_install_common_save(main_window *widgets){ if (parameters){ char *command_parameters = yon_char_parsed_to_string(parameters,size," -- "); char *command = yon_char_unite(ubconfig_dull_command,"--target system ",command_parameters,NULL); - if (!system(command)){} + if (!system(yon_debug_output("%s\n",command))){} free(command); yon_char_parsed_free(parameters,size); } @@ -105,7 +105,7 @@ int yon_install_separate_save(main_window *widgets){ if (parameters){ char *command_parameters = yon_char_parsed_to_string(parameters,size," -- "); char *command = yon_char_unite(ubconfig_dull_command,"--target system ",command_parameters,NULL); - if (!system(command)){} + if (!system(yon_debug_output("%s\n",command))){} free(command); yon_char_parsed_free(parameters,size); } @@ -163,7 +163,7 @@ int yon_install_same_partition_save(main_window *widgets){ if (parameters){ char *command_parameters = yon_char_parsed_to_string(parameters,size," -- "); char *command = yon_char_unite(ubconfig_dull_command,"--target system ",command_parameters,NULL); - if (!system(command)){} + if (!system(yon_debug_output("%s\n",command))){} free(command); yon_char_parsed_free(parameters,size); } diff --git a/source/ubinstall-gtk-keyboard.c b/source/ubinstall-gtk-keyboard.c index 05d660b..2ca7d6e 100644 --- a/source/ubinstall-gtk-keyboard.c +++ b/source/ubinstall-gtk-keyboard.c @@ -58,7 +58,7 @@ int yon_keyboard_save(main_window *widgets){ if (parameters){ char *command_parameters = yon_char_parsed_to_string(parameters,size," -- "); char *command = yon_char_unite(ubconfig_dull_command,"--target system ",command_parameters,NULL); - if (!system(command)){} + if (!system(yon_debug_output("%s\n",command))){} free(command); yon_char_parsed_free(parameters,size); } diff --git a/source/ubinstall-gtk-network.c b/source/ubinstall-gtk-network.c index b3f1766..81f85f8 100644 --- a/source/ubinstall-gtk-network.c +++ b/source/ubinstall-gtk-network.c @@ -291,7 +291,7 @@ int yon_network_save(main_window *widgets){ if (parameters){ char *command_parameters = yon_char_parsed_to_string(parameters,save_size," -- "); char *command = yon_char_unite(ubconfig_dull_command,"--target system ",command_parameters,NULL); - if (!system(command)){} + if (!system(yon_debug_output("%s\n",command))){} free(command); yon_char_parsed_free(parameters,save_size); } diff --git a/source/ubinstall-gtk-page-switch.c b/source/ubinstall-gtk-page-switch.c index 8868485..318e7dd 100644 --- a/source/ubinstall-gtk-page-switch.c +++ b/source/ubinstall-gtk-page-switch.c @@ -36,6 +36,8 @@ enum YON_PAGES yon_page_get_next(main_window *widgets, enum YON_PAGES page){ case YON_PAGE_CONFIGURE_END: case YON_PAGE_COMPLETION: on_reboot_accepted(widgets); + gtk_main_quit(); + exit(0); break; // default:return YON_PAGE_WELCOME; } diff --git a/source/ubinstall-gtk-region.c b/source/ubinstall-gtk-region.c index 69135ab..9732ec9 100644 --- a/source/ubinstall-gtk-region.c +++ b/source/ubinstall-gtk-region.c @@ -45,7 +45,7 @@ int yon_region_save(main_window *widgets){ if (parameters){ char *command_parameters = yon_char_parsed_to_string(parameters,size," -- "); char *command = yon_char_unite(ubconfig_dull_command,"--target system ",command_parameters,NULL); - if (!system(command)){} + if (!system(yon_debug_output("%s\n",command))){} free(command); yon_char_parsed_free(parameters,size); } diff --git a/source/ubinstall-gtk-separate.c b/source/ubinstall-gtk-separate.c index 3485f71..5403d94 100644 --- a/source/ubinstall-gtk-separate.c +++ b/source/ubinstall-gtk-separate.c @@ -28,7 +28,7 @@ int yon_install_options_save(GtkWidget *device_tree, GtkWidget *part_tree,char * if (parameters){ char *command_parameters = yon_char_parsed_to_string(parameters,size," -- "); char *command = yon_char_unite(ubconfig_dull_command,"--target system ",command_parameters,NULL); - if (!system(command)){} + if (!system(yon_debug_output("%s\n",command))){} free(command); yon_char_parsed_free(parameters,size); } diff --git a/source/ubinstall-gtk-startup-services.c b/source/ubinstall-gtk-startup-services.c index 4ad1d67..45bb8db 100644 --- a/source/ubinstall-gtk-startup-services.c +++ b/source/ubinstall-gtk-startup-services.c @@ -216,7 +216,7 @@ int yon_startup_save(main_window *widgets){ if (parameters){ char *command_parameters = yon_char_parsed_to_string(parameters,size," -- "); char *command = yon_char_unite(ubconfig_dull_command,"--target system ",command_parameters,NULL); - if (!system(command)){} + if (!system(yon_debug_output("%s\n",command))){} free(command); yon_char_parsed_free(parameters,size); } diff --git a/source/ubinstall-gtk-users.c b/source/ubinstall-gtk-users.c index 43631f5..18db20c 100644 --- a/source/ubinstall-gtk-users.c +++ b/source/ubinstall-gtk-users.c @@ -41,7 +41,7 @@ int yon_users_save(main_window *widgets){ if (parameters){ char *command_parameters = yon_char_parsed_to_string(parameters,size," -- "); char *command = yon_char_unite(ubconfig_dull_command,"--target system ",command_parameters,NULL); - if (!system(command)){} + if (!system(yon_debug_output("%s\n",command))){} free(command); yon_char_parsed_free(parameters,save_size); } diff --git a/source/ubinstall-gtk.c b/source/ubinstall-gtk.c index c76f701..b5183c4 100644 --- a/source/ubinstall-gtk.c +++ b/source/ubinstall-gtk.c @@ -484,7 +484,6 @@ void on_gparted_open(){ yon_launch_app_with_arguments(open_gparted_command,NULL); } - void on_reboot_accepted(main_window *){ g_mutex_lock(&main_config.install_mutex); if (main_config.install_thread){