Commands changes

source/ubinstall-gtk-install-start.c

@@ -22,7 +22,7 @@ void *on_quick_install_start(void *data){
 
         g_idle_add((GSourceFunc)yon_progress_bar_start,widgets);
         if (!main_config.dry_run){
-            char *command = yon_debug_output("%s\n",quick_install_command(main_config.config_load_path));
+            char *command = yon_debug_output("%s\n",auto_install_command(main_config.config_load_path));
             yon_debug_output("%s\n","Entered installation");
             if (system(yon_debug_output("%s\n",command))){
 

source/ubinstall-gtk-saving.c

@@ -191,10 +191,10 @@ void *on_config_save(void *data){
     main_window *widgets = (main_window*)data;
 
         g_idle_add((GSourceFunc)yon_progress_bar_start,widgets);
+        char *command = yon_debug_output("%s\n",install_start_command(main_config.config_save_path));
         if (!main_config.dry_run){
-            char *command = yon_debug_output("%s\n",save_config_command);
             yon_debug_output("%s\n","Entered installation");
-            if (system(yon_debug_output("%s\n",command))){
+            if (system(command)){
 
                 gdk_threads_add_idle((GSourceFunc)on_install_error,widgets);
                 free(command);
@@ -221,9 +221,9 @@ void *on_setup_system_configuration(void * data){
     main_window *widgets = (main_window*)data;
     if (widgets){};
         
+            char *command = yon_debug_output("%s\n",configuration_start_command(main_config.config_save_path));
         if (!main_config.dry_run){
-            char *command = set_user_config_command;
+            if (system(command)){};
-            if (system(yon_debug_output("%s\n",command))){};
             free(command);
         } else {
             yon_launch("ubconfig --source system get /");

source/ubinstall-gtk.c

@@ -1037,7 +1037,7 @@ void yon_main_window_create(main_window *widgets){
 
     gtk_tree_model_filter_set_visible_func(GTK_TREE_MODEL_FILTER(widgets->InstallerCountryFilter),(GtkTreeModelFilterVisibleFunc)on_country_filter,widgets,NULL);
     
-    if (main_config.autoinstall){
+    if (main_config.autoinstall||!yon_char_is_empty(config(finish_parameter))){
         on_autoinstall_start(NULL,widgets);
     }
 

source/ubinstall-gtk.h

@@ -296,12 +296,10 @@ layout && /description:/ {\
 
 #define get_localisation_command "ubconfig -ea --source global get [autoinstall] AUTOINSTALL[installer_locale] -- get [autoinstall] AUTOINSTALL['ubconfig set [locale] LANG'] -- get [locale] LANG"
 
-#define save_config_command yon_char_unite("/usr/bin/bash -c \"nice ubinstall autoinstall",main_config.debug_mode?" --debug":"","\"", NULL)
+#define install_start_command(path) yon_char_unite("/usr/bin/bash -c \"nice ubinstall autoinstall",main_config.debug_mode?" --debug":""," --noautoconfig --noinstall_extra"," --config='",path,"'\"", NULL)
-#define quick_install_command(path) yon_char_unite("nice ubinstall autoinstall",main_config.debug_mode?" --debug":""," --config='",path,"' --noautoconfig --noinstall_extra", NULL)
+#define configuration_start_command(path) yon_char_unite("nice ubinstall autoconfig install_extra",main_config.debug_mode?" --debug":""," --config='",path,"'\"", NULL)
-#define auto_install_command(path) yon_char_unite("nice ubinstall autoinstall",main_config.debug_mode?" --debug":""," --config='",path,"' --autoinstall", NULL)
 
-#define set_user_config_command yon_char_unite("nice ubinstall autoconfig",main_config.debug_mode?" --debug":""," install_extra", NULL)
+#define auto_install_command(path) yon_char_unite("nice ubinstall autoinstall",main_config.debug_mode?" --debug":""," --config='",path,"'", NULL)
-#define save_additional_config_command(parameters) yon_char_unite("ubconfig --target system set [autoinstall] ", parameters, NULL)
 
 #define get_default_password_command "ubconfig --raw --conarg --source default get [users] NOSECUREROOTPASSWD"