From 67972c66a6392532b52a0f9089a405d8eb2b5c53 Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Wed, 24 Jan 2024 16:55:08 +0300 Subject: [PATCH] lol --- data/scripts/automatic-partition-install.sh | 8 ++++---- data/scripts/begin-install.sh | 4 ++-- data/scripts/manual-partition-install.sh | 4 ++-- src/build_ui.rs | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/data/scripts/automatic-partition-install.sh b/data/scripts/automatic-partition-install.sh index 9a0f7cc..c5564f1 100644 --- a/data/scripts/automatic-partition-install.sh +++ b/data/scripts/automatic-partition-install.sh @@ -39,7 +39,7 @@ then mount /dev/${DISK}p2 /media/pika-install-mount/boot mkdir -p /media/pika-install-mount/boot/efi mount /dev/${DISK}p1 /media/pika-install-mount/boot/efi - pikainstall -r /media/pika-install-mount/ -l ${LOCALE} -k ${KEYBOARD} -t ${TIMEZONE} && touch /tmp/pika-installer-gtk4-successful.txt + pikainstall -r /media/pika-install-mount/ -c ${LUKS_KEY} -l ${LOCALE} -k ${KEYBOARD} -t ${TIMEZONE} && touch /tmp/pika-installer-gtk4-successful.txt || touch /tmp/pika-installer-gtk4-fail.txt && exit 1 else sleep 10 # Add filesystems @@ -57,7 +57,7 @@ then mount /dev/${DISK}2 /media/pika-install-mount/boot mkdir -p /media/pika-install-mount/boot/efi mount /dev/${DISK}1 /media/pika-install-mount/boot/efi - pikainstall -r /media/pika-install-mount/ -l ${LOCALE} -k ${KEYBOARD} -t ${TIMEZONE} && touch /tmp/pika-installer-gtk4-successful.txt -l ${LOCALE} -k ${KEYBOARD} -t ${TIMEZONE} && touch /tmp/pika-installer-gtk4-successful.txt + pikainstall -r /media/pika-install-mount/ -c ${LUKS_KEY} -l ${LOCALE} -k ${KEYBOARD} -t ${TIMEZONE} && touch /tmp/pika-installer-gtk4-successful.txt || touch /tmp/pika-installer-gtk4-fail.txt && exit 1 fi else LUKS_KEY="$(cat "/tmp/pika-installer-gtk4-target-automatic-luks.txt")" @@ -92,7 +92,7 @@ else mount /dev/${DISK}p2 /media/pika-install-mount/boot mkdir -p /media/pika-install-mount/boot/efi mount /dev/${DISK}p1 /media/pika-install-mount/boot/efi - pikainstall -r /media/pika-install-mount/ -c ${LUKS_KEY} -l ${LOCALE} -k ${KEYBOARD} -t ${TIMEZONE} && touch /tmp/pika-installer-gtk4-successful.txt -l ${LOCALE} -k ${KEYBOARD} -t ${TIMEZONE} && touch /tmp/pika-installer-gtk4-successful.txt + pikainstall -r /media/pika-install-mount/ -c ${LUKS_KEY} -l ${LOCALE} -k ${KEYBOARD} -t ${TIMEZONE} && touch /tmp/pika-installer-gtk4-successful.txt || touch /tmp/pika-installer-gtk4-fail.txt && exit 1 else sleep 10 # Add filesystems @@ -114,6 +114,6 @@ else mount /dev/${DISK}2 /media/pika-install-mount/boot mkdir -p /media/pika-install-mount/boot/efi mount /dev/${DISK}1 /media/pika-install-mount/boot/efi - pikainstall -r /media/pika-install-mount/ -c ${LUKS_KEY} -l ${LOCALE} -k ${KEYBOARD} -t ${TIMEZONE} && touch /tmp/pika-installer-gtk4-successful.txt -l ${LOCALE} -k ${KEYBOARD} -t ${TIMEZONE} && touch /tmp/pika-installer-gtk4-successful.txt + pikainstall -r /media/pika-install-mount/ -c ${LUKS_KEY} -l ${LOCALE} -k ${KEYBOARD} -t ${TIMEZONE} && touch /tmp/pika-installer-gtk4-successful.txt || touch /tmp/pika-installer-gtk4-fail.txt && exit 1 fi fi \ No newline at end of file diff --git a/data/scripts/begin-install.sh b/data/scripts/begin-install.sh index 4915a26..7b534d5 100644 --- a/data/scripts/begin-install.sh +++ b/data/scripts/begin-install.sh @@ -2,11 +2,11 @@ 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 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 else echo "critical installer error" && exit 1 && touch /tmp/pika-installer-gtk4-fail.txt fi diff --git a/data/scripts/manual-partition-install.sh b/data/scripts/manual-partition-install.sh index f6ed24e..19fab24 100644 --- a/data/scripts/manual-partition-install.sh +++ b/data/scripts/manual-partition-install.sh @@ -11,8 +11,8 @@ touch "/tmp/pika-installer-gtk4-status-parting.txt" if [[ ! -f "/tmp/pika-installer-gtk4-target-manual-luks.txt" ]] then - pikainstall -r ${DISK}/ -l ${LOCALE} -k ${KEYBOARD} -t ${TIMEZONE} && touch /tmp/pika-installer-gtk4-successful.txt + pikainstall -r ${DISK}/ -l ${LOCALE} -k ${KEYBOARD} -t ${TIMEZONE} && touch /tmp/pika-installer-gtk4-successful.txt || touch /tmp/pika-installer-gtk4-fail.txt && exit 1 else LUKS_KEY="$(cat "/tmp/pika-installer-gtk4-target-manual-luks.txt")" - pikainstall -r ${DISK}/ -c ${LUKS_KEY} -l ${LOCALE} -k ${KEYBOARD} -t ${TIMEZONE} && touch /tmp/pika-installer-gtk4-successful.txt + pikainstall -r ${DISK}/ -c ${LUKS_KEY} -l ${LOCALE} -k ${KEYBOARD} -t ${TIMEZONE} && touch /tmp/pika-installer-gtk4-successful.txt || touch /tmp/pika-installer-gtk4-fail.txt && exit 1 fi \ No newline at end of file diff --git a/src/build_ui.rs b/src/build_ui.rs index 46f01de..4f6a997 100644 --- a/src/build_ui.rs +++ b/src/build_ui.rs @@ -38,7 +38,7 @@ pub fn build_ui(app: &adw::Application) { /// Add adwaita title box let window_title_bar = gtk::HeaderBar::builder() - .show_title_buttons(true) + .show_title_buttons(false) .build(); /// Add page Stack containing all primary contents