Gnome branding tests

build_iso.sh

@@ -1,33 +1,10 @@
 rm -fv *.iso
 
-prof="crystal"
-
-if [[ "$1" == "" ]]; then
-    printf "cli/gui : "
-    read MODE
-else
-    MODE="$1"
-fi
-
-if [[ "$MODE" == "cli" ]]; then
-    sed -i 's/gnome/#gnome/g' ${prof}/packages.x86_64
-    sed -i 's/mesa/#mesa/g' ${prof}/packages.x86_64
-else
-    sed -i 's/DISABLED/ENABLED/g' chrooted.sh
-fi
-
 WORKDIR=$(mktemp -d)
 # idk if this would've happened automatically?
-cp ${prof}/pacman.conf ${prof}/airootfs/etc/.
+cp crystal/pacman.conf crystal/airootfs/etc/.
-cp ${prof}/packages.x86_64 ${prof}/airootfs/etc/packages.x86_64
+cp crystal/packages.x86_64 crystal/airootfs/etc/packages.x86_64
-cp /etc/pacman.d/mirrorlist ${prof}/airootfs/etc/pacman.d/.
+cp /etc/pacman.d/mirrorlist crystal/airootfs/etc/pacman.d/.
-echo "Built on $(date +"%D @ %T EST")" > ${prof}/airootfs/etc/buildstamp
+echo "Built on $(date +"%D @ %T EST")" > crystal/airootfs/etc/buildstamp
-time sudo ./mkarchiso -v -w $WORKDIR -o . ${prof}
+time sudo ./mkarchiso -v -w $WORKDIR -o . crystal
 sudo rm -rf $WORKDIR
-
-if [[ "$MODE" == "cli" ]]; then
-    sed -i 's/#gnome/gnome/g' ${prof}/packages.x86_64
-    sed -i 's/#mesa/mesa/g' ${prof}/packages.x86_64
-else
-    sed -i 's/ENABLED/DISABLED/g' chrooted.sh
-fi

chrooted.sh

@@ -1,18 +1,19 @@
 #!/bin/bash
 
-GRAPHICAL="DISABLED"
-
-echo "New system chroot running as $(whoami)"
-printf "We're in the new system."
-#read
-
 # This file is run via mkarchiso while chrooted as the new system
-echo "We're in the new system. :)"
+echo "chrooted in the new system, running as $(whoami)"
+
 echo "Performing minor tweaks"
 sed -i 's/Arch Linux/CrystalUX/g' /etc/issue
+
 sed -i 's/Arch Linux/CrystalUX/g' /etc/arch-release
+
 sed -i 's/Arch Linux/CrystalUX/g' /etc/os-release
+sed -i 's/LOGO=archlinux/LOGO=crystalux/g' /etc/os-release
+
 sed -i 's/Arch Linux/CrystalUX/g' /usr/lib/os-release
+sed -i 's/LOGO=archlinux/LOGO=crystalux/g' /usr/lib/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
@@ -27,13 +28,11 @@ if [[ -d /etc/crystal/bootopts ]]; then
     chmod +x /etc/crystal/bootopts/*
 fi
 
-if [[ "$GRAPHICAL" == "DISABLED" ]]; then
+echo "export XDG_SESSION_TYPE=x11" > /home/crystal/.xinitrc
-    echo "export XDG_SESSION_TYPE=x11" > /home/crystal/.xinitrc
+echo "export GDK_BACKEND=x11" >> /home/crystal/.xinitrc
-    echo "export GDK_BACKEND=x11" >> /home/crystal/.xinitrc
+echo "exec gnome-session" >> /home/crystal/.xinitrc
-    echo "exec gnome-session" >> /home/crystal/.xinitrc
+chown crystal:crystal /home/crystal/.xinitrc
-    chown crystal:crystal /home/crystal/.xinitrc
+chmod +x /home/crystal/.xinitrc
-    chmod +x /home/crystal/.xinitrc
-fi
 
 # i'm tired ok
 echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen

crystal/airootfs/etc/buildstamp

@@ -1 +1 @@
-Built on 05/08/21 @ 21:09:12 EST
+Built on 05/08/21 @ 22:45:29 EST

crystal/airootfs/etc/packages.x86_64

@@ -19,5 +19,6 @@ mesa
 
 crystal-misc
 crystal-cli-boot
+crystal-branding
 neofetch
 amethyst

crystal/packages.x86_64

@@ -19,5 +19,6 @@ mesa
 
 crystal-misc
 crystal-cli-boot
+crystal-branding
 neofetch
 amethyst