custom-gui-packages/pika-installer-gtk4
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Debug Build
All checks were successful
PikaOS Package Build & Release (Canary) (amd64-v3) / build (push) Successful in 2m59s
Details

Browse Source
This commit is contained in:
Ward from fusion-voyager-3 2024-08-24 00:45:03 +03:00
parent 84638cbb9a
commit afad8be554
4 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/release-canary-v3 vendored
View File

@ -1 +1 @@
2 3

2
debian/changelog vendored
View File

@ -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 * Just rebuild in OS 4

4
src/installation_progress_page/mod.rs
View File

@ -43,7 +43,7 @@ pub fn create_installation_script(
partition_method_manual_fstab_entry_array_refcell: &Rc<RefCell<Vec<FstabEntry>>>, partition_method_manual_fstab_entry_array_refcell: &Rc<RefCell<Vec<FstabEntry>>>,
partition_method_manual_luks_enabled_refcell: &Rc<RefCell<bool>>, partition_method_manual_luks_enabled_refcell: &Rc<RefCell<bool>>,
partition_method_manual_crypttab_entry_array_refcell: &Rc<RefCell<Vec<CrypttabEntry>>>, partition_method_manual_crypttab_entry_array_refcell: &Rc<RefCell<Vec<CrypttabEntry>>>,
) { ) -> String {
let mut final_script = String::new(); let mut final_script = String::new();
let standard_installation_format = strfmt::strfmt( let standard_installation_format = strfmt::strfmt(
@ -428,5 +428,5 @@ touch /tmp/pika-installer-gtk4-swaplist
_ => panic!() _ => panic!()
} }
println!("{}", final_script) final_script
} }

37
src/installation_summary_page/mod.rs
View File

@ -9,6 +9,10 @@ use glib::{clone, closure_local};
use gtk::{gio, glib}; use gtk::{gio, glib};
use std::{cell::RefCell, fs, ops::Deref, path::Path, process::Command, rc::Rc}; use std::{cell::RefCell, fs, ops::Deref, path::Path, process::Command, rc::Rc};
/// DEBUG
use duct::cmd;
/// DEBUG END
pub fn installation_summary_page( pub fn installation_summary_page(
main_carousel: &adw::Carousel, main_carousel: &adw::Carousel,
language_changed_action: &gio::SimpleAction, language_changed_action: &gio::SimpleAction,
@ -102,21 +106,24 @@ pub fn installation_summary_page(
partition_method_manual_crypttab_entry_array_refcell, partition_method_manual_crypttab_entry_array_refcell,
move |_| move |_|
{ {
installation_progress_page::create_installation_script( let big_cmd = cmd!("bash", "-c",
&language_selection_text_refcell, installation_progress_page::create_installation_script(
&keymap_selection_text_refcell, &language_selection_text_refcell,
&timezone_selection_text_refcell, &keymap_selection_text_refcell,
&partition_method_type_refcell, &timezone_selection_text_refcell,
&partition_method_automatic_target_refcell, &partition_method_type_refcell,
&partition_method_automatic_target_fs_refcell, &partition_method_automatic_target_refcell,
&partition_method_automatic_luks_enabled_refcell, &partition_method_automatic_target_fs_refcell,
&partition_method_automatic_luks_refcell, &partition_method_automatic_luks_enabled_refcell,
&partition_method_automatic_ratio_refcell, &partition_method_automatic_luks_refcell,
&partition_method_automatic_seperation_refcell, &partition_method_automatic_ratio_refcell,
&partition_method_manual_fstab_entry_array_refcell, &partition_method_automatic_seperation_refcell,
&partition_method_manual_luks_enabled_refcell, &partition_method_manual_fstab_entry_array_refcell,
&partition_method_manual_crypttab_entry_array_refcell, &partition_method_manual_luks_enabled_refcell,
); &partition_method_manual_crypttab_entry_array_refcell,
)
);
assert!(big_cmd.run().is_ok());
} }
) )
); );