From 4b6ac18be90ab328cf3ee9b2f6abaef90840e7bb Mon Sep 17 00:00:00 2001
From: Ward from fusion-voyager-3 <hotrod.master@hotmail.com>
Date: Fri, 23 Aug 2024 22:00:56 +0300
Subject: [PATCH] finish up all the progs

---
 src/installation_progress_page/auto_basic.rs  | 18 ++----------------
 .../manual_basic.rs                           | 19 +++++++++++++++++++
 src/installation_progress_page/mod.rs         | 12 ++++++++++++
 3 files changed, 33 insertions(+), 16 deletions(-)
 create mode 100644 src/installation_progress_page/manual_basic.rs

diff --git a/src/installation_progress_page/auto_basic.rs b/src/installation_progress_page/auto_basic.rs
index e818ea4..538a99c 100644
--- a/src/installation_progress_page/auto_basic.rs
+++ b/src/installation_progress_page/auto_basic.rs
@@ -1,21 +1,7 @@
-pub const standard_installation_prog: &str = r###"#! /bin/bash
-set -e
-
-SOCKET_PATH="/tmp/pikainstall-status.sock"
-
-PIKA_INSTALL_CHROOT_PATH={CHROOT_PATH}
-PIKA_INSTALL_LOCALE="{LOCALE}.UTF-8"
-PIKA_INSTALL_KEYMAP_BASE={KEYMAP_BASE}
-PIKA_INSTALL_KEYMAP_VARIANT={KEYMAP_VARIANT}
-PIKA_INSTALL_TIMEZONE={TIMEZONE}
-
-touch "/tmp/pika-installer-gtk4-status.txt"
-echo 'PARTING' | nc -U $SOCKET_PATH
-
-"###;
-
 pub const automatic_standard_installation_prog: &str = r###"
 
+echo 'PARTING' | nc -U $SOCKET_PATH || true
+
 PIKA_INSTALL_AUTO_TARGET_DISK={AUTO_INSTALL_TARGET_DISK}
 
 for part in $(/usr/lib/pika/pika-installer-gtk4/scripts/partition-utility.sh get_partitions | grep "$PIKA_INSTALL_AUTO_TARGET_DISK"); do
diff --git a/src/installation_progress_page/manual_basic.rs b/src/installation_progress_page/manual_basic.rs
new file mode 100644
index 0000000..7bc2bbe
--- /dev/null
+++ b/src/installation_progress_page/manual_basic.rs
@@ -0,0 +1,19 @@
+pub const manual_open_part_pikainstall_prog: &str = r###"
+
+if [ -z $PIKA_INSTALL_KEYMAP_VARIANT ]
+then
+pikainstall --manual 1 -r $PIKA_INSTALL_CHROOT_PATH -l $PIKA_INSTALL_LOCALE -k $PIKA_INSTALL_KEYMAP_BASE -t $PIKA_INSTALL_TIMEZONE
+else
+pikainstall --manual 1 -r $PIKA_INSTALL_CHROOT_PATH -l $PIKA_INSTALL_LOCALE -k $PIKA_INSTALL_KEYMAP_BASE -t $PIKA_INSTALL_TIMEZONE
+fi -kv $PIKA_INSTALL_KEYMAP_VARIANT
+"###;
+
+pub const manual_locked_part_pikainstall_prog: &str = r###"
+
+if [ -z $PIKA_INSTALL_KEYMAP_VARIANT ]
+then
+pikainstall --manual 2 -r $PIKA_INSTALL_CHROOT_PATH -l $PIKA_INSTALL_LOCALE -k $PIKA_INSTALL_KEYMAP_BASE -t $PIKA_INSTALL_TIMEZONE
+else
+pikainstall --manual 2-r $PIKA_INSTALL_CHROOT_PATH -l $PIKA_INSTALL_LOCALE -k $PIKA_INSTALL_KEYMAP_BASE -t $PIKA_INSTALL_TIMEZONE
+fi -kv $PIKA_INSTALL_KEYMAP_VARIANT
+"###;
\ No newline at end of file
diff --git a/src/installation_progress_page/mod.rs b/src/installation_progress_page/mod.rs
index 0756b57..785bb8a 100644
--- a/src/installation_progress_page/mod.rs
+++ b/src/installation_progress_page/mod.rs
@@ -8,6 +8,18 @@ use glib::{clone, closure_local};
 use gtk::{gio, glib};
 use std::{cell::RefCell, fs, ops::Deref, path::Path, process::Command, rc::Rc};
 
+pub const standard_installation_prog: &str = r###"#! /bin/bash
+set -e
+
+SOCKET_PATH="/tmp/pikainstall-status.sock"
+
+PIKA_INSTALL_CHROOT_PATH={CHROOT_PATH}
+PIKA_INSTALL_LOCALE="{LOCALE}.UTF-8"
+PIKA_INSTALL_KEYMAP_BASE={KEYMAP_BASE}
+PIKA_INSTALL_KEYMAP_VARIANT={KEYMAP_VARIANT}
+PIKA_INSTALL_TIMEZONE={TIMEZONE}
+"###;
+
 pub fn create_installation_script(
     language_selection_text_refcell: &Rc<RefCell<PikaLocale>>,
     keymap_selection_text_refcell: &Rc<RefCell<PikaKeymap>>,