lol
This commit is contained in:
parent
234c753d91
commit
67972c66a6
@ -39,7 +39,7 @@ then
|
|||||||
mount /dev/${DISK}p2 /media/pika-install-mount/boot
|
mount /dev/${DISK}p2 /media/pika-install-mount/boot
|
||||||
mkdir -p /media/pika-install-mount/boot/efi
|
mkdir -p /media/pika-install-mount/boot/efi
|
||||||
mount /dev/${DISK}p1 /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
|
else
|
||||||
sleep 10
|
sleep 10
|
||||||
# Add filesystems
|
# Add filesystems
|
||||||
@ -57,7 +57,7 @@ then
|
|||||||
mount /dev/${DISK}2 /media/pika-install-mount/boot
|
mount /dev/${DISK}2 /media/pika-install-mount/boot
|
||||||
mkdir -p /media/pika-install-mount/boot/efi
|
mkdir -p /media/pika-install-mount/boot/efi
|
||||||
mount /dev/${DISK}1 /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
|
fi
|
||||||
else
|
else
|
||||||
LUKS_KEY="$(cat "/tmp/pika-installer-gtk4-target-automatic-luks.txt")"
|
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
|
mount /dev/${DISK}p2 /media/pika-install-mount/boot
|
||||||
mkdir -p /media/pika-install-mount/boot/efi
|
mkdir -p /media/pika-install-mount/boot/efi
|
||||||
mount /dev/${DISK}p1 /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
|
else
|
||||||
sleep 10
|
sleep 10
|
||||||
# Add filesystems
|
# Add filesystems
|
||||||
@ -114,6 +114,6 @@ else
|
|||||||
mount /dev/${DISK}2 /media/pika-install-mount/boot
|
mount /dev/${DISK}2 /media/pika-install-mount/boot
|
||||||
mkdir -p /media/pika-install-mount/boot/efi
|
mkdir -p /media/pika-install-mount/boot/efi
|
||||||
mount /dev/${DISK}1 /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
|
||||||
fi
|
fi
|
@ -2,11 +2,11 @@
|
|||||||
|
|
||||||
if [[ -f /tmp/pika-installer-gtk4-target-manual.txt ]]
|
if [[ -f /tmp/pika-installer-gtk4-target-manual.txt ]]
|
||||||
then
|
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
|
else
|
||||||
if [[ -f /tmp/pika-installer-gtk4-target-auto.txt ]]
|
if [[ -f /tmp/pika-installer-gtk4-target-auto.txt ]]
|
||||||
then
|
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
|
else
|
||||||
echo "critical installer error" && exit 1 && touch /tmp/pika-installer-gtk4-fail.txt
|
echo "critical installer error" && exit 1 && touch /tmp/pika-installer-gtk4-fail.txt
|
||||||
fi
|
fi
|
||||||
|
@ -11,8 +11,8 @@ touch "/tmp/pika-installer-gtk4-status-parting.txt"
|
|||||||
|
|
||||||
if [[ ! -f "/tmp/pika-installer-gtk4-target-manual-luks.txt" ]]
|
if [[ ! -f "/tmp/pika-installer-gtk4-target-manual-luks.txt" ]]
|
||||||
then
|
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
|
else
|
||||||
LUKS_KEY="$(cat "/tmp/pika-installer-gtk4-target-manual-luks.txt")"
|
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
|
fi
|
@ -38,7 +38,7 @@ pub fn build_ui(app: &adw::Application) {
|
|||||||
|
|
||||||
/// Add adwaita title box
|
/// Add adwaita title box
|
||||||
let window_title_bar = gtk::HeaderBar::builder()
|
let window_title_bar = gtk::HeaderBar::builder()
|
||||||
.show_title_buttons(true)
|
.show_title_buttons(false)
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
/// Add page Stack containing all primary contents
|
/// Add page Stack containing all primary contents
|
||||||
|
Loading…
Reference in New Issue
Block a user