From 65c6a920ce6589fdc0b0150f6587e381510628de Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Tue, 16 Sep 2025 16:22:24 +0600 Subject: [PATCH] Fixed slide saving --- source/ubinstall-gtk-bootloader.c | 3 ++- source/ubinstall-gtk-components.c | 15 ++++++++++----- source/ubinstall-gtk-grub.c | 6 ++++-- source/ubinstall-gtk-installation.c | 9 ++++++--- source/ubinstall-gtk-keyboard.c | 3 ++- source/ubinstall-gtk-network.c | 3 ++- source/ubinstall-gtk-region.c | 3 ++- source/ubinstall-gtk-separate.c | 3 ++- source/ubinstall-gtk-startup-services.c | 3 ++- source/ubinstall-gtk-users.c | 3 ++- source/ubinstall-gtk.c | 3 ++- 11 files changed, 36 insertions(+), 18 deletions(-) diff --git a/source/ubinstall-gtk-bootloader.c b/source/ubinstall-gtk-bootloader.c index ee5106a..c92c234 100644 --- a/source/ubinstall-gtk-bootloader.c +++ b/source/ubinstall-gtk-bootloader.c @@ -49,7 +49,8 @@ int yon_bootloader_save(main_window *widgets){ config_str final = yon_char_parsed_merge(save_parameters,size,grub_users,users_size,&final_size); config_str parameters = yon_config_get_save_parameters_by_list(&save_size,final,final_size); if (parameters){ - char *command = yon_char_parsed_to_string(parameters,size,";"); + 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)){} free(command); yon_char_parsed_free(parameters,save_size); diff --git a/source/ubinstall-gtk-components.c b/source/ubinstall-gtk-components.c index b2b054f..f99bed6 100644 --- a/source/ubinstall-gtk-components.c +++ b/source/ubinstall-gtk-components.c @@ -31,7 +31,8 @@ int yon_kernel_save(main_window *widgets){ int size; config_str parameters = yon_config_get_save_parameters_by_key(&size,modules_extra_parameter,KERNEL_BOOT_parameter,NULL); if (parameters){ - char *command = yon_char_parsed_to_string(parameters,size,";"); + 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)){} free(command); yon_char_parsed_free(parameters,size); @@ -64,7 +65,8 @@ int yon_kernel_addon_save(main_window *widgets){ int size; config_str parameters = yon_config_get_save_parameters_by_key(&size,modules_extra_parameter,NULL); if (parameters){ - char *command = yon_char_parsed_to_string(parameters,size,";"); + 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)){} free(command); yon_char_parsed_free(parameters,size); @@ -97,7 +99,8 @@ int yon_os_components_save(main_window *widgets){ int size; config_str parameters = yon_config_get_save_parameters_by_key(&size,modules_parameter,NULL); if (parameters){ - char *command = yon_char_parsed_to_string(parameters,size,";"); + 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)){} free(command); yon_char_parsed_free(parameters,size); @@ -224,7 +227,8 @@ int yon_software_save(main_window *widgets){ int size; config_str parameters = yon_config_get_save_parameters_by_key(&size,modules_extra_parameter,NULL); if (parameters){ - char *command = yon_char_parsed_to_string(parameters,size,";"); + 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)){} free(command); yon_char_parsed_free(parameters,size); @@ -288,7 +292,8 @@ int yon_pacman_software_save(main_window *widgets){ int size; config_str parameters = yon_config_get_save_parameters_by_key(&size,packages_parameter,NULL); if (parameters){ - char *command = yon_char_parsed_to_string(parameters,size,";"); + 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)){} free(command); yon_char_parsed_free(parameters,size); diff --git a/source/ubinstall-gtk-grub.c b/source/ubinstall-gtk-grub.c index d07a041..2d65341 100644 --- a/source/ubinstall-gtk-grub.c +++ b/source/ubinstall-gtk-grub.c @@ -24,7 +24,8 @@ int yon_grub_install_save(main_window *widgets){ int size; config_str parameters = yon_config_get_save_parameters_by_key(&size,AUTOINSTALL_DEVICE,part_parameter,AUTOINSTALL_TYPE_INSTALL,NULL); if (parameters){ - char *command = yon_char_parsed_to_string(parameters,size,";"); + 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)){} free(command); yon_char_parsed_free(parameters,size); @@ -57,7 +58,8 @@ int yon_grub_update_save(main_window *widgets){ int size; config_str parameters = yon_config_get_save_parameters_by_key(&size,AUTOINSTALL_DEVICE,part_parameter,AUTOINSTALL_TYPE_INSTALL,NULL); if (parameters){ - char *command = yon_char_parsed_to_string(parameters,size,";"); + 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)){} free(command); yon_char_parsed_free(parameters,size); diff --git a/source/ubinstall-gtk-installation.c b/source/ubinstall-gtk-installation.c index ddc0813..064d435 100644 --- a/source/ubinstall-gtk-installation.c +++ b/source/ubinstall-gtk-installation.c @@ -33,7 +33,8 @@ int yon_install_common_save(main_window *widgets){ int size; config_str parameters = yon_config_get_save_parameters_by_key(&size,AUTOINSTALL_TYPE_INSTALL,AUTOINSTALL_DEVICE,part_label_parameter,part_fs_type_parameter,NULL); if (parameters){ - char *command = yon_char_parsed_to_string(parameters,size,";"); + 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)){} free(command); yon_char_parsed_free(parameters,size); @@ -102,7 +103,8 @@ int yon_install_separate_save(main_window *widgets){ int size; config_str parameters = yon_config_get_save_parameters_by_key(&size,part_format_parameter,part_label_parameter,part_fs_type_parameter,AUTOINSTALL_DEVICE,part_parameter,NULL); if (parameters){ - char *command = yon_char_parsed_to_string(parameters,size,";"); + 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)){} free(command); yon_char_parsed_free(parameters,size); @@ -159,7 +161,8 @@ int yon_install_same_partition_save(main_window *widgets){ int size; config_str parameters = yon_config_get_save_parameters_by_key(&size,part_format_parameter,part_size_parameter,part_label_parameter,part_fs_type_parameter,AUTOINSTALL_TYPE_INSTALL,AUTOINSTALL_DEVICE,part_parameter,NULL); if (parameters){ - char *command = yon_char_parsed_to_string(parameters,size,";"); + 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)){} free(command); yon_char_parsed_free(parameters,size); diff --git a/source/ubinstall-gtk-keyboard.c b/source/ubinstall-gtk-keyboard.c index 1b786d8..05d660b 100644 --- a/source/ubinstall-gtk-keyboard.c +++ b/source/ubinstall-gtk-keyboard.c @@ -56,7 +56,8 @@ int yon_keyboard_save(main_window *widgets){ int size; config_str parameters = yon_config_get_save_parameters_by_key(&size,xkbvariant_parameter,xkblayout_parameter,xkbmodel_parameter,xkboptions_parameter,NULL); if (parameters){ - char *command = yon_char_parsed_to_string(parameters,size,";"); + 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)){} free(command); yon_char_parsed_free(parameters,size); diff --git a/source/ubinstall-gtk-network.c b/source/ubinstall-gtk-network.c index 27014a1..2e8b893 100644 --- a/source/ubinstall-gtk-network.c +++ b/source/ubinstall-gtk-network.c @@ -289,7 +289,8 @@ int yon_network_save(main_window *widgets){ config_str final = yon_char_parsed_merge(save_parameters,size,users,users_size,&final_size); config_str parameters = yon_config_get_save_parameters_by_list(&save_size,final,final_size); if (parameters){ - char *command = yon_char_parsed_to_string(parameters,size,";"); + 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)){} free(command); yon_char_parsed_free(parameters,save_size); diff --git a/source/ubinstall-gtk-region.c b/source/ubinstall-gtk-region.c index ff003e1..69135ab 100644 --- a/source/ubinstall-gtk-region.c +++ b/source/ubinstall-gtk-region.c @@ -43,7 +43,8 @@ int yon_region_save(main_window *widgets){ int size; config_str parameters = yon_config_get_save_parameters_by_key(&size,locale_parameter,lang_parameter,zone_parameter,NULL); if (parameters){ - char *command = yon_char_parsed_to_string(parameters,size,";"); + 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)){} free(command); yon_char_parsed_free(parameters,size); diff --git a/source/ubinstall-gtk-separate.c b/source/ubinstall-gtk-separate.c index 824861e..3485f71 100644 --- a/source/ubinstall-gtk-separate.c +++ b/source/ubinstall-gtk-separate.c @@ -26,7 +26,8 @@ int yon_install_options_save(GtkWidget *device_tree, GtkWidget *part_tree,char * int size; config_str parameters = yon_config_get_save_parameters_by_key(&size,AUTOINSTALL_DEVICE,AUTOINSTALL_TYPE_INSTALL,part_parameter,NULL); if (parameters){ - char *command = yon_char_parsed_to_string(parameters,size,";"); + 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)){} 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 25f19ac..4ad1d67 100644 --- a/source/ubinstall-gtk-startup-services.c +++ b/source/ubinstall-gtk-startup-services.c @@ -214,7 +214,8 @@ int yon_startup_save(main_window *widgets){ int size; config_str parameters = yon_config_get_save_parameters_by_key(&size,SERVICES_ENABLE_parameter,NULL); if (parameters){ - char *command = yon_char_parsed_to_string(parameters,size,";"); + 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)){} free(command); yon_char_parsed_free(parameters,size); diff --git a/source/ubinstall-gtk-users.c b/source/ubinstall-gtk-users.c index 7607204..43631f5 100644 --- a/source/ubinstall-gtk-users.c +++ b/source/ubinstall-gtk-users.c @@ -39,7 +39,8 @@ int yon_users_save(main_window *widgets){ config_str final = yon_char_parsed_merge(save_parameters,size,users,users_size,&final_size); config_str parameters = yon_config_get_save_parameters_by_list(&save_size,final,final_size); if (parameters){ - char *command = yon_char_parsed_to_string(parameters,size,";"); + 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)){} free(command); yon_char_parsed_free(parameters,save_size); diff --git a/source/ubinstall-gtk.c b/source/ubinstall-gtk.c index a6a21e3..8410e50 100644 --- a/source/ubinstall-gtk.c +++ b/source/ubinstall-gtk.c @@ -200,7 +200,8 @@ void on_source_accept(GtkWidget *,source_window *window){ int size; config_str parameters = yon_config_get_save_parameters_by_key(&size,locale_parameter,lang_parameter,zone_parameter,NULL); if (parameters){ - char *command = yon_char_parsed_to_string(parameters,size,";"); + 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)){} free(command); yon_char_parsed_free(parameters,size);