attempt to properly pass environment variables
All checks were successful
PikaOS Package Build & Release (amd64-v3) / build (push) Successful in 2m17s
All checks were successful
PikaOS Package Build & Release (amd64-v3) / build (push) Successful in 2m17s
This commit is contained in:
parent
f3c2580c0e
commit
390b3dae75
2
.github/release-nest-v3
vendored
2
.github/release-nest-v3
vendored
@ -1 +1 @@
|
|||||||
4
|
5
|
2
debian/changelog
vendored
2
debian/changelog
vendored
@ -1,4 +1,4 @@
|
|||||||
pika-installer-gtk4 (2.0.0-101pika3) pika; urgency=low
|
pika-installer-gtk4 (2.0.0-101pika5) pika; urgency=low
|
||||||
|
|
||||||
* First Release of new installer
|
* First Release of new installer
|
||||||
|
|
||||||
|
@ -125,7 +125,7 @@ pub fn installation_progress_page(
|
|||||||
installation_progress_log_scroll,
|
installation_progress_log_scroll,
|
||||||
move |_|
|
move |_|
|
||||||
{
|
{
|
||||||
if installation_progress_log_scroll.vadjustment().upper() - installation_progress_log_scroll.vadjustment().value() < (installation_progress_log_scroll.size(gtk::Orientation::Vertical) as f64 * 1.35 ) {
|
if installation_progress_log_scroll.vadjustment().upper() - installation_progress_log_scroll.vadjustment().value() < (installation_progress_log_scroll.size(gtk::Orientation::Vertical) as f64 * 1.48 ) {
|
||||||
installation_progress_log_scroll.vadjustment().set_value(installation_progress_log_scroll.vadjustment().upper())
|
installation_progress_log_scroll.vadjustment().set_value(installation_progress_log_scroll.vadjustment().upper())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -33,7 +33,7 @@ blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK" || systemctl restart s
|
|||||||
|
|
||||||
pub const AUTOMATIC_OPEN_PART_PIKAINSTALL_PROG: &str = r###"
|
pub const AUTOMATIC_OPEN_PART_PIKAINSTALL_PROG: &str = r###"
|
||||||
|
|
||||||
if [ -z $PIKA_INSTALL_XKB_VARIANT ]
|
if [ -z "$PIKA_INSTALL_XKB_VARIANT" ]
|
||||||
then
|
then
|
||||||
pikainstall -r $PIKA_INSTALL_CHROOT_PATH -l $PIKA_INSTALL_LOCALE -k $PIKA_INSTALL_KEYMAP -kl $PIKA_INSTALL_XKB_LAYOUT -t $PIKA_INSTALL_TIMEZONE
|
pikainstall -r $PIKA_INSTALL_CHROOT_PATH -l $PIKA_INSTALL_LOCALE -k $PIKA_INSTALL_KEYMAP -kl $PIKA_INSTALL_XKB_LAYOUT -t $PIKA_INSTALL_TIMEZONE
|
||||||
else
|
else
|
||||||
@ -43,10 +43,10 @@ fi
|
|||||||
|
|
||||||
pub const AUTOMATIC_LOCKED_PART_PIKAINSTALL_PROG: &str = r###"
|
pub const AUTOMATIC_LOCKED_PART_PIKAINSTALL_PROG: &str = r###"
|
||||||
|
|
||||||
if [ -z $PIKA_INSTALL_XKB_VARIANT ]
|
if [ -z "$PIKA_INSTALL_XKB_VARIANT" ]
|
||||||
then
|
then
|
||||||
pikainstall -c $PIKA_INSTALL_AUTO_LUKS_PASSWORD -r $PIKA_INSTALL_CHROOT_PATH -l $PIKA_INSTALL_LOCALE -k $PIKA_INSTALL_KEYMAP -kl $PIKA_INSTALL_XKB_LAYOUT -t $PIKA_INSTALL_TIMEZONE
|
pikainstall -c "$PIKA_INSTALL_AUTO_LUKS_PASSWORD" -r "$PIKA_INSTALL_CHROOT_PATH" -l "$PIKA_INSTALL_LOCALE" -k "$PIKA_INSTALL_KEYMAP" -kl "$PIKA_INSTALL_XKB_LAYOUT" -t "$PIKA_INSTALL_TIMEZONE"
|
||||||
else
|
else
|
||||||
pikainstall -c $PIKA_INSTALL_AUTO_LUKS_PASSWORD -r $PIKA_INSTALL_CHROOT_PATH -l $PIKA_INSTALL_LOCALE -k $PIKA_INSTALL_KEYMAP -kl $PIKA_INSTALL_XKB_LAYOUT -t $PIKA_INSTALL_TIMEZONE -kv $PIKA_INSTALL_XKB_VARIANT
|
pikainstall -c "$PIKA_INSTALL_AUTO_LUKS_PASSWORD" -r "$PIKA_INSTALL_CHROOT_PATH" -l "$PIKA_INSTALL_LOCALE" -k "$PIKA_INSTALL_KEYMAP" -kl "$PIKA_INSTALL_XKB_LAYOUT" -t "$PIKA_INSTALL_TIMEZONE" -kv "$PIKA_INSTALL_XKB_VARIANT"
|
||||||
fi
|
fi
|
||||||
"###;
|
"###;
|
@ -30,20 +30,20 @@ echo '{LUKS_PASSWD}' | cryptsetup luksAddKey UUID='{UUID}' /tmp/PIKA_CRYPT/key-{
|
|||||||
|
|
||||||
pub const MANUAL_OPEN_PART_PIKAINSTALL_PROG: &str = r###"
|
pub const MANUAL_OPEN_PART_PIKAINSTALL_PROG: &str = r###"
|
||||||
|
|
||||||
if [ -z $PIKA_INSTALL_XKB_VARIANT ]
|
if [ -z "$PIKA_INSTALL_XKB_VARIANT" ]
|
||||||
then
|
then
|
||||||
pikainstall --manual 1 -r $PIKA_INSTALL_CHROOT_PATH -l $PIKA_INSTALL_LOCALE -k $PIKA_INSTALL_KEYMAP -kl $PIKA_INSTALL_XKB_LAYOUT -t $PIKA_INSTALL_TIMEZONE
|
pikainstall --manual 1 -r "$PIKA_INSTALL_CHROOT_PATH" -l "$PIKA_INSTALL_LOCALE" -k "$PIKA_INSTALL_KEYMAP" -kl "$PIKA_INSTALL_XKB_LAYOUT" -t "$PIKA_INSTALL_TIMEZONE"
|
||||||
else
|
else
|
||||||
pikainstall --manual 1 -r $PIKA_INSTALL_CHROOT_PATH -l $PIKA_INSTALL_LOCALE -k $PIKA_INSTALL_KEYMAP -kl $PIKA_INSTALL_XKB_LAYOUT -t $PIKA_INSTALL_TIMEZONE -kv $PIKA_INSTALL_XKB_VARIANT
|
pikainstall --manual 1 -r "$PIKA_INSTALL_CHROOT_PATH" -l "$PIKA_INSTALL_LOCALE" -k "$PIKA_INSTALL_KEYMAP" -kl "$PIKA_INSTALL_XKB_LAYOUT" -t "$PIKA_INSTALL_TIMEZONE" -kv "$PIKA_INSTALL_XKB_VARIANT"
|
||||||
fi
|
fi
|
||||||
"###;
|
"###;
|
||||||
|
|
||||||
pub const MANUAL_LOCKED_PART_PIKAINSTALL_PROG: &str = r###"
|
pub const MANUAL_LOCKED_PART_PIKAINSTALL_PROG: &str = r###"
|
||||||
|
|
||||||
if [ -z $PIKA_INSTALL_XKB_VARIANT ]
|
if [ -z "$PIKA_INSTALL_XKB_VARIANT" ]
|
||||||
then
|
then
|
||||||
pikainstall --manual 2 -r $PIKA_INSTALL_CHROOT_PATH -l $PIKA_INSTALL_LOCALE -k $PIKA_INSTALL_KEYMAP -kl $PIKA_INSTALL_XKB_LAYOUT -t $PIKA_INSTALL_TIMEZONE
|
pikainstall --manual 2 -r "$PIKA_INSTALL_CHROOT_PATH" -l "$PIKA_INSTALL_LOCALE" -k "$PIKA_INSTALL_KEYMAP" -kl "$PIKA_INSTALL_XKB_LAYOUT" -t "$PIKA_INSTALL_TIMEZONE"
|
||||||
else
|
else
|
||||||
pikainstall --manual 2 -r $PIKA_INSTALL_CHROOT_PATH -l $PIKA_INSTALL_LOCALE -k $PIKA_INSTALL_KEYMAP -kl $PIKA_INSTALL_XKB_LAYOUT -t $PIKA_INSTALL_TIMEZONE -kv $PIKA_INSTALL_XKB_VARIANT
|
pikainstall --manual 2 -r "$PIKA_INSTALL_CHROOT_PATH" -l "$PIKA_INSTALL_LOCALE" -k "$PIKA_INSTALL_KEYMAP" -kl "$PIKA_INSTALL_XKB_LAYOUT" -t "$PIKA_INSTALL_TIMEZONE" -kv "$PIKA_INSTALL_XKB_VARIANT"
|
||||||
fi
|
fi
|
||||||
"###;
|
"###;
|
Loading…
Reference in New Issue
Block a user