From d62c0f3a4f931a00c86ffbfbdafc5c46695d3184 Mon Sep 17 00:00:00 2001
From: "Ward Nakchbandi (Cosmic Fusion)"
 <83735213+CosmicFusion@users.noreply.github.com>
Date: Wed, 25 Oct 2023 17:22:48 +0300
Subject: [PATCH]

---
 pikainstall/debian/changelog                  |  2 +-
 .../pika/pikainstall/pika-install-chroot.sh   | 28 +++++++++----------
 .../lib/pika/pikainstall/pika-install-host.sh |  2 +-
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/pikainstall/debian/changelog b/pikainstall/debian/changelog
index 27ecbf7..ee27f8e 100644
--- a/pikainstall/debian/changelog
+++ b/pikainstall/debian/changelog
@@ -1,4 +1,4 @@
-pikainstall (1.0.5-100pika11) pikauwu; urgency=medium
+pikainstall (1.0.5-100pika12) pikauwu; urgency=medium
 
   * Initial release.
 
diff --git a/pikainstall/usr/lib/pika/pikainstall/pika-install-chroot.sh b/pikainstall/usr/lib/pika/pikainstall/pika-install-chroot.sh
index c8c6410..65c0b54 100755
--- a/pikainstall/usr/lib/pika/pikainstall/pika-install-chroot.sh
+++ b/pikainstall/usr/lib/pika/pikainstall/pika-install-chroot.sh
@@ -15,19 +15,19 @@ chmod +x /var/albius-refind_linux.sh
 /var/albius-refind_linux.sh
 refind-install
 apt install -y /var/cache/apt/archives/pika-refind-theme*.deb /var/cache/apt/archives/booster*.deb
-apt remove casper vanilla-installer -y
-apt autoremove -y
-locale-gen
-useradd -m -k -U pikaos
-echo pikaos:pikaos | sudo chpasswd
-usermod -a -G sudo pikaos
+apt remove casper vanilla-installer -y || true
+apt autoremove -y || true
+locale-gen || true
+useradd -m -k -U pikaos || true
+echo pikaos:pikaos | chpasswd || true
+usermod -a -G sudo pikaos || true
 usermod -a -G lpadmin pikaos || true
-mkdir -p /etc/gdm3
-mkdir -p /etc/sddm.conf.d/
-echo -e '[daemon]\nAutomaticLogin=pikaos\nAutomaticLoginEnable=True' >> /etc/gdm3/custom.conf
-echo -e '[Autologin]\nUser=pikaos\nSession=plasma' > /etc/sddm.conf.d/autologin.conf
-mkdir -p /home/pikaos
+mkdir -p /etc/gdm3 || true
+mkdir -p /etc/sddm.conf.d/ || true
+echo -e '[daemon]\nAutomaticLogin=pikaos\nAutomaticLoginEnable=True' >> /etc/gdm3/custom.conf || true
+echo -e '[Autologin]\nUser=pikaos\nSession=plasma' > /etc/sddm.conf.d/zautologin.conf || true
+mkdir -p /home/pikaos || true
 cp -rvf /etc/skel/.* /home/pikaos/ || true
-mkdir -p /home/pikaos/.config/autostart
-cp /usr/share/applications/pika-first-setup.desktop /home/pikaos/.config/autostart
-chown -R pikaos:pikaos /home/pikaos
\ No newline at end of file
+mkdir -p /home/pikaos/.config/autostart || true
+cp /usr/share/applications/pika-first-setup.desktop /home/pikaos/.config/autostart || true
+chown -R pikaos:pikaos /home/pikaos || true
\ No newline at end of file
diff --git a/pikainstall/usr/lib/pika/pikainstall/pika-install-host.sh b/pikainstall/usr/lib/pika/pikainstall/pika-install-host.sh
index eeafa13..a90939f 100755
--- a/pikainstall/usr/lib/pika/pikainstall/pika-install-host.sh
+++ b/pikainstall/usr/lib/pika/pikainstall/pika-install-host.sh
@@ -13,4 +13,4 @@ genfstab -U "$1" > "$1"/etc/fstab
 cat "$1"/etc/fstab | grep -v zram > "$1"/etc/fstab
 mkdir -pv "$1"/usr/lib/pika/pikainstall/
 cp -rvf /usr/lib/pika/pikainstall/pika-install-chroot.sh "$1"/usr/lib/pika/pikainstall/
-chroot "$1" /bin/bash -c "su - -c /usr/lib/pika/pikainstall/pika-install-chroot.sh"
+chroot "$1" /bin/bash -c "/usr/lib/pika/pikainstall/pika-install-chroot.sh"