diff --git a/.github/release-canary-v3 b/.github/release-canary-v3 index 0cfbf08..e440e5c 100644 --- a/.github/release-canary-v3 +++ b/.github/release-canary-v3 @@ -1 +1 @@ -2 +3 \ No newline at end of file diff --git a/debian/changelog b/debian/changelog index bcfb713..9f840e6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -pika-installer-gtk4 (1.0.2-101pika1) pika; urgency=low +pika-installer-gtk4 (1.0.2-101pika2) pika; urgency=low * Just rebuild in OS 4 diff --git a/src/installation_progress_page/mod.rs b/src/installation_progress_page/mod.rs index df0d6ba..ef5689c 100644 --- a/src/installation_progress_page/mod.rs +++ b/src/installation_progress_page/mod.rs @@ -43,7 +43,7 @@ pub fn create_installation_script( partition_method_manual_fstab_entry_array_refcell: &Rc>>, partition_method_manual_luks_enabled_refcell: &Rc>, partition_method_manual_crypttab_entry_array_refcell: &Rc>>, -) { +) -> String { let mut final_script = String::new(); let standard_installation_format = strfmt::strfmt( @@ -428,5 +428,5 @@ touch /tmp/pika-installer-gtk4-swaplist _ => panic!() } - println!("{}", final_script) + final_script } diff --git a/src/installation_summary_page/mod.rs b/src/installation_summary_page/mod.rs index c76feae..51b92fd 100644 --- a/src/installation_summary_page/mod.rs +++ b/src/installation_summary_page/mod.rs @@ -9,6 +9,10 @@ use glib::{clone, closure_local}; use gtk::{gio, glib}; use std::{cell::RefCell, fs, ops::Deref, path::Path, process::Command, rc::Rc}; +/// DEBUG +use duct::cmd; +/// DEBUG END + pub fn installation_summary_page( main_carousel: &adw::Carousel, language_changed_action: &gio::SimpleAction, @@ -102,21 +106,24 @@ pub fn installation_summary_page( partition_method_manual_crypttab_entry_array_refcell, move |_| { - installation_progress_page::create_installation_script( - &language_selection_text_refcell, - &keymap_selection_text_refcell, - &timezone_selection_text_refcell, - &partition_method_type_refcell, - &partition_method_automatic_target_refcell, - &partition_method_automatic_target_fs_refcell, - &partition_method_automatic_luks_enabled_refcell, - &partition_method_automatic_luks_refcell, - &partition_method_automatic_ratio_refcell, - &partition_method_automatic_seperation_refcell, - &partition_method_manual_fstab_entry_array_refcell, - &partition_method_manual_luks_enabled_refcell, - &partition_method_manual_crypttab_entry_array_refcell, - ); + let big_cmd = cmd!("bash", "-c", + installation_progress_page::create_installation_script( + &language_selection_text_refcell, + &keymap_selection_text_refcell, + &timezone_selection_text_refcell, + &partition_method_type_refcell, + &partition_method_automatic_target_refcell, + &partition_method_automatic_target_fs_refcell, + &partition_method_automatic_luks_enabled_refcell, + &partition_method_automatic_luks_refcell, + &partition_method_automatic_ratio_refcell, + &partition_method_automatic_seperation_refcell, + &partition_method_manual_fstab_entry_array_refcell, + &partition_method_manual_luks_enabled_refcell, + &partition_method_manual_crypttab_entry_array_refcell, + ) + ); + assert!(big_cmd.run().is_ok()); } ) );