Fixing stuff

build_iso.sh

@@ -1,15 +1,5 @@
-rm -fv pearos-live-*.iso
+rm -fv crystal-live-*.iso
 
-"""
-fallocate -l800M sysroot.img
-loopdev=$(sudo losetup -Pf --show sysroot.img)
-sudo mkfs.ext4 ${loopdev}
-sysrootwork=$(mktemp -d)
-sudo mount ${loopdev} $sysrootwork
-sudo pacstrap ${sysrootwork} $(cat sysrootpkgs)
-sudo umount ${sysrootwork}
-mv sysroot.img pear/airootfs/.
-"""
 
 WORKDIR=$(mktemp -d)
 # idk if this would've happened automatically?
@@ -17,7 +7,7 @@ cp pear/pacman.conf pear/airootfs/etc/.
 cp pear/packages.x86_64 pear/airootfs/etc/packages.x86_64
 cp /etc/pacman.d/mirrorlist pear/airootfs/etc/pacman.d/.
 echo "Built on $(date +"%D @ %T EST")" > pear/airootfs/etc/buildstamp
-time sudo ./mkarchiso -v -w $WORKDIR -o . pear
+time sudo ./mkarchiso -v -w $WORKDIR -o . crystal
 sudo rm -rf $WORKDIR
 
 if [[ "$1" == "docker" ]]; then

chrooted.sh

@@ -2,10 +2,10 @@
 # This file is run via mkarchiso while chrooted as the new system
 echo "We're in the new system. :)"
 echo "Performing minor tweaks"
-sed -i 's/Arch/PearOS/g' /etc/issue
-sed -i 's/Arch/PearOS/g' /etc/arch-release
-sed -i 's/Arch/PearOS/g' /etc/os-release
-echo "PearLive" > /etc/hostname
+sed -i 's/Arch/CrystalUX/g' /etc/issue
+sed -i 's/Arch/CrystalUX/g' /etc/arch-release
+sed -i 's/Arch/CrystalUX/g' /etc/os-release
+echo "CrystalLive" > /etc/hostname
 #reflector --latest 5 --sort rate --save /etc/pacman.d/mirrorlist
 echo "sudo reflector --verbose --latest 5 --sort rate --save /etc/pacman.d/mirrorlist" >> /usr/bin/mirrorsetup
 chmod +x /usr/bin/mirrorsetup

crystal/packages.removed

@@ -0,0 +1,5 @@
+pear-resources
+pear-skel
+pear-misc
+palamares
+pear-qtmares

crystal/packages.x86_64

@@ -39,12 +39,6 @@ dolphin
 tk
 tree
 
-pear-resources
-pear-skel
-pear-misc
-palamares
-pear-qtmares
-
 base
 cloud-init
 linux

crystal/pacman.conf

@@ -75,9 +75,9 @@ RemoteFileSigLevel = Never
 #[testing]
 #Include = /etc/pacman.d/mirrorlist
 
-[pear]
-Server = https://repo.xhec.us/pear
-SigLevel = Never
+#[pear]
+#Server = https://repo.xhec.us/pear
+#SigLevel = Never
 
 [core]
 Include = /etc/pacman.d/mirrorlist

crystal/profiledef.sh

@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
 # shellcheck disable=SC2034
 
-iso_name="pearos-live"
-iso_label="PEAR_$(date +%Y%m)"
-iso_publisher="PearOS Linux <https://github.com/phoenix277yt/PearOS-arch>"
-iso_application="PearOS Live"
+iso_name="crystal-live"
+iso_label="CRYS_$(date +%Y%m)"
+iso_publisher="CrystalUX <https://github.com/CrystalUX-project"
+iso_application="CrystalUX Live"
 iso_version="$(date +%Y.%m.%d)"
 install_dir="arch"
 bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito' 'uefi-x64.systemd-boot.esp' 'uefi-x64.systemd-boot.eltorito')