diff --git a/data/scripts/begin-install.sh b/data/scripts/begin-install.sh index 6cc4363..2d9ba09 100644 --- a/data/scripts/begin-install.sh +++ b/data/scripts/begin-install.sh @@ -6,12 +6,12 @@ exec &> >(tee /tmp/pika-installer-gtk4-log) if [[ -f /tmp/pika-installer-gtk4-target-manual.txt ]] then - sudo /usr/lib/pika/pika-installer-gtk4/scripts/manual-partition-install.sh || touch /tmp/pika-installer-gtk4-fail.txt + sudo /usr/lib/pika/pika-installer-gtk4/scripts/manual-partition-install.sh || sudo touch /tmp/pika-installer-gtk4-fail.txt else if [[ -f /tmp/pika-installer-gtk4-target-auto.txt ]] then - sudo /usr/lib/pika/pika-installer-gtk4/scripts/automatic-partition-install.sh || touch /tmp/pika-installer-gtk4-fail.txt + sudo /usr/lib/pika/pika-installer-gtk4/scripts/automatic-partition-install.sh || sudo touch /tmp/pika-installer-gtk4-fail.txt else - echo "critical installer error" && touch /tmp/pika-installer-gtk4-fail.txt && exit 1 + echo "critical installer error" && sudo touch /tmp/pika-installer-gtk4-fail.txt && exit 1 fi fi diff --git a/debian/changelog b/debian/changelog index aba3f06..a531d58 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -pika-installer-gtk4 (1.0.1-100pika1) pikauwu; urgency=low +pika-installer-gtk4 (1.0.1-100pika2) pikauwu; urgency=low * First release diff --git a/src/automatic_partitioning/mod.rs b/src/automatic_partitioning/mod.rs index df10abb..93e6036 100644 --- a/src/automatic_partitioning/mod.rs +++ b/src/automatic_partitioning/mod.rs @@ -78,8 +78,7 @@ pub fn automatic_partitioning( let devices_selection_expander_row_viewport = gtk::ScrolledWindow::builder().height_request(200).build(); - let devices_selection_expander_row_viewport_box = gtk::ListBox::builder() - .build(); + let devices_selection_expander_row_viewport_box = gtk::ListBox::builder().build(); devices_selection_expander_row_viewport_box.add_css_class("boxed-list"); devices_selection_expander_row_viewport @@ -241,12 +240,15 @@ pub fn automatic_partitioning( } if partition_method_automatic_luks_password_entry.text().to_string().is_empty() { partition_method_automatic_luks_error_label.set_visible(true); + partition_method_automatic_luks_buffer.set_text(&partition_method_automatic_luks_password_entry.text().to_string()); bottom_next_button.set_sensitive(false); } else { partition_method_automatic_luks_error_label.set_visible(false); if !partition_method_automatic_disk_error_label.get_visible() && !partition_method_automatic_luks_error_label.get_visible() && !partition_method_automatic_luks_error2_label.get_visible() { + partition_method_automatic_luks_buffer.set_text(&partition_method_automatic_luks_password_entry.text().to_string()); bottom_next_button.set_sensitive(true); } else { + partition_method_automatic_luks_buffer.set_text(&partition_method_automatic_luks_password_entry.text().to_string()); bottom_next_button.set_sensitive(false); } } @@ -255,8 +257,10 @@ pub fn automatic_partitioning( partition_method_automatic_luks_error_label.set_visible(false); partition_method_automatic_luks_error2_label.set_visible(false); if !partition_method_automatic_disk_error_label.get_visible() && !partition_method_automatic_luks_error_label.get_visible() && !partition_method_automatic_luks_error2_label.get_visible() { + partition_method_automatic_luks_buffer.set_text(&partition_method_automatic_luks_password_entry.text().to_string()); bottom_next_button.set_sensitive(true); } else { + partition_method_automatic_luks_buffer.set_text(&partition_method_automatic_luks_password_entry.text().to_string()); bottom_next_button.set_sensitive(false); } } @@ -272,12 +276,15 @@ pub fn automatic_partitioning( } if partition_method_automatic_luks_password_entry.text().to_string().is_empty() { partition_method_automatic_luks_error_label.set_visible(true); + partition_method_automatic_luks_buffer.set_text(&partition_method_automatic_luks_password_entry.text().to_string()); bottom_next_button.set_sensitive(false); } else { partition_method_automatic_luks_error_label.set_visible(false); if !partition_method_automatic_disk_error_label.get_visible() && !partition_method_automatic_luks_error_label.get_visible() && !partition_method_automatic_luks_error2_label.get_visible() { + partition_method_automatic_luks_buffer.set_text(&partition_method_automatic_luks_password_entry.text().to_string()); bottom_next_button.set_sensitive(true); } else { + partition_method_automatic_luks_buffer.set_text(&partition_method_automatic_luks_password_entry.text().to_string()); bottom_next_button.set_sensitive(false); } } @@ -286,8 +293,10 @@ pub fn automatic_partitioning( partition_method_automatic_luks_error_label.set_visible(false); partition_method_automatic_luks_error2_label.set_visible(false); if !partition_method_automatic_disk_error_label.get_visible() && !partition_method_automatic_luks_error_label.get_visible() && !partition_method_automatic_luks_error2_label.get_visible() { + partition_method_automatic_luks_buffer.set_text(&partition_method_automatic_luks_password_entry.text().to_string()); bottom_next_button.set_sensitive(true); } else { + partition_method_automatic_luks_buffer.set_text(&partition_method_automatic_luks_password_entry.text().to_string()); bottom_next_button.set_sensitive(false); } } @@ -303,12 +312,15 @@ pub fn automatic_partitioning( } if partition_method_automatic_luks_password_entry.text().to_string().is_empty() { partition_method_automatic_luks_error_label.set_visible(true); + partition_method_automatic_luks_buffer.set_text(&partition_method_automatic_luks_password_entry.text().to_string()); bottom_next_button.set_sensitive(false); } else { partition_method_automatic_luks_error_label.set_visible(false); if !partition_method_automatic_disk_error_label.get_visible() && !partition_method_automatic_luks_error_label.get_visible() && !partition_method_automatic_luks_error2_label.get_visible() { + partition_method_automatic_luks_buffer.set_text(&partition_method_automatic_luks_password_entry.text().to_string()); bottom_next_button.set_sensitive(true); } else { + partition_method_automatic_luks_buffer.set_text(&partition_method_automatic_luks_password_entry.text().to_string()); bottom_next_button.set_sensitive(false); } } @@ -317,8 +329,10 @@ pub fn automatic_partitioning( partition_method_automatic_luks_error_label.set_visible(false); partition_method_automatic_luks_error2_label.set_visible(false); if !partition_method_automatic_disk_error_label.get_visible() && !partition_method_automatic_luks_error_label.get_visible() && !partition_method_automatic_luks_error2_label.get_visible() { + partition_method_automatic_luks_buffer.set_text(&partition_method_automatic_luks_password_entry.text().to_string()); bottom_next_button.set_sensitive(true); } else { + partition_method_automatic_luks_buffer.set_text(&partition_method_automatic_luks_password_entry.text().to_string()); bottom_next_button.set_sensitive(false); } } diff --git a/src/keyboard_page/mod.rs b/src/keyboard_page/mod.rs index 123337a..5ca81de 100644 --- a/src/keyboard_page/mod.rs +++ b/src/keyboard_page/mod.rs @@ -129,8 +129,7 @@ pub fn keyboard_page(content_stack: >k::Stack) { let keyboard_selection_expander_row_viewport = gtk::ScrolledWindow::builder().height_request(355).build(); - let keyboard_selection_expander_row_viewport_box = gtk::ListBox::builder() - .build(); + let keyboard_selection_expander_row_viewport_box = gtk::ListBox::builder().build(); keyboard_selection_expander_row_viewport_box.add_css_class("boxed-list"); let keyboard_selection_expander_row_viewport_listbox = gtk::ListBox::builder() @@ -204,7 +203,13 @@ pub fn keyboard_page(content_stack: >k::Stack) { .build(); let keyboard_layout_row = adw::ActionRow::builder() .activatable_widget(&keyboard_layout_checkbutton) - .title(gnome_desktop::XkbInfo::new().layout_info(&keyboard_layout).unwrap().0.unwrap()) + .title( + gnome_desktop::XkbInfo::new() + .layout_info(&keyboard_layout) + .unwrap() + .0 + .unwrap(), + ) .subtitle(keyboard_layout.clone()) .build(); keyboard_layout_row.add_prefix(&keyboard_layout_checkbutton); diff --git a/src/language_page/mod.rs b/src/language_page/mod.rs index 38e551b..01d4d12 100644 --- a/src/language_page/mod.rs +++ b/src/language_page/mod.rs @@ -127,8 +127,7 @@ pub fn language_page(content_stack: >k::Stack) { let language_selection_expander_row_viewport = gtk::ScrolledWindow::builder().height_request(420).build(); - let language_selection_expander_row_viewport_box = gtk::ListBox::builder() - .build(); + let language_selection_expander_row_viewport_box = gtk::ListBox::builder().build(); language_selection_expander_row_viewport_box.add_css_class("boxed-list"); language_selection_expander_row_viewport @@ -187,10 +186,11 @@ pub fn language_page(content_stack: >k::Stack) { for locale in locale_reader.lines() { let locale = locale.unwrap(); - let locale_name_cli = Command::new("/usr/lib/pika/pika-installer-gtk4/scripts/locale-name.py") - .arg(locale.clone()) - .output() - .expect("failed to execute process"); + let locale_name_cli = + Command::new("/usr/lib/pika/pika-installer-gtk4/scripts/locale-name.py") + .arg(locale.clone()) + .output() + .expect("failed to execute process"); let locale_name = String::from_utf8(locale_name_cli.stdout).unwrap(); let locale_clone = locale.clone(); let locale_checkbutton = gtk::CheckButton::builder() @@ -212,7 +212,12 @@ pub fn language_page(content_stack: >k::Stack) { lang_data_buffer.set_text(&locale); } })); - if current_locale.contains(&(locale_clone)) && current_locale != "C.UTF-8" && current_locale != "C" && current_locale != "C.utf8" && current_locale != "POSIX" { + if current_locale.contains(&(locale_clone)) + && current_locale != "C.UTF-8" + && current_locale != "C" + && current_locale != "C.utf8" + && current_locale != "POSIX" + { locale_checkbutton.set_active(true); } } diff --git a/src/timezone_page/mod.rs b/src/timezone_page/mod.rs index 1b73b2f..4032e76 100644 --- a/src/timezone_page/mod.rs +++ b/src/timezone_page/mod.rs @@ -127,8 +127,7 @@ pub fn timezone_page(content_stack: >k::Stack) { let timezone_selection_expander_row_viewport = gtk::ScrolledWindow::builder().height_request(420).build(); - let timezone_selection_expander_row_viewport_box = gtk::ListBox::builder() - .build(); + let timezone_selection_expander_row_viewport_box = gtk::ListBox::builder().build(); timezone_selection_expander_row_viewport_box.add_css_class("boxed-list"); let timezone_selection_expander_row_viewport_listbox = gtk::ListBox::builder()