From 806269b33eac55fb0465b393ec18c69728c177af Mon Sep 17 00:00:00 2001
From: axtloss <axtlos@tar.black>
Date: Thu, 18 Aug 2022 20:48:18 +0200
Subject: [PATCH] Change workflow file

---
 .github/workflows/build.yml |  7 +++++--
 .gitignore                  |  1 +
 chrooted.sh                 | 34 ----------------------------------
 3 files changed, 6 insertions(+), 36 deletions(-)
 delete mode 100755 chrooted.sh

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4acda06..c9106c9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,7 +23,10 @@ jobs:
          git clone https://github.com/crystal-linux/iso/
          cd iso
          bash build_iso.sh
-         md5sum *.iso > MD5SUMS
+         md5sum *.iso > MD5SUM-iso
+         rm chrooted.sh
+         bash build_rootfs.sh
+         md5sum *.tar.gz > MD5SUM-rootfs
          
 
       - name: Get current date
@@ -33,7 +36,7 @@ jobs:
       - name: Upload 
         uses: ncipollo/release-action@v1
         with:
-           artifacts: "iso/*.iso,iso/MD5SUMS"
+           artifacts: "iso/*.iso,iso/MD5SUM-iso,iso/*.tar.gz,iso/MD5SUM-rootfs"
            token: ${{ secrets.GITHUB_TOKEN }}
            tag: ${{ steps.date.outputs.date }} 
         
diff --git a/.gitignore b/.gitignore
index 8fd2cf6..1b42677 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 *.iso
 crystal/airootfs/etc/pacman.conf
 crystal/airootfs/etc/buildstamp
+chrooted.sh
diff --git a/chrooted.sh b/chrooted.sh
deleted file mode 100755
index 02f2022..0000000
--- a/chrooted.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env bash
-echo "Chrooted in the new system, running as $(whoami)"
-
-# Compile GSchemas
-glib-compile-schemas /usr/share/glib-2.0/schemas
-
-# User setup
-useradd -mG wheel crystal
-usermod -c "Password // \"crystal\"" crystal
-usermod -p $(echo "crystal" | openssl passwd -6 -stdin) crystal
-usermod -p $(echo "crystal" | openssl passwd -6 -stdin) root
-chsh -s /usr/bin/zsh crystal
-
-# Install Jade's GUI
-flatpak install -y --noninteractive /usr/share/jade-gui/jade-gui.flatpak
-
-# Desktop icon for Jade's GUI
-mkdir -p /home/crystal/Desktop
-cp \
-  /var/lib/flatpak/exports/share/applications/al.getcryst.jadegui.desktop \
-  /home/crystal/Desktop/Install.desktop
-chown -R crystal:crystal /home/crystal/
-
-# Services
-systemctl enable NetworkManager
-systemctl enable mirrorlist
-systemctl enable gdm
-
-# Hostname and Locale
-echo "crystal-live" > /etc/hostname
-echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen
-locale-gen
-echo "LANG=en_US.UTF-8" > /etc/locale.conf
-echo "Configured the system. Exiting chroot."