From ddef836780ad28cd41ba543475145421683bb715 Mon Sep 17 00:00:00 2001
From: Iru Cai <mytbk920423@gmail.com>
Date: Mon, 3 Dec 2018 00:05:09 +0800
Subject: update gloriousarch/xfce

---
 distro/gloriousarch/xfce/entry1     |  9 +++------
 distro/gloriousarch/xfce/install.sh | 14 +++-----------
 distro/gloriousarch/xfce/isoinfo    |  4 ++--
 3 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/distro/gloriousarch/xfce/entry1 b/distro/gloriousarch/xfce/entry1
index aa279ab..7239c8d 100644
--- a/distro/gloriousarch/xfce/entry1
+++ b/distro/gloriousarch/xfce/entry1
@@ -1,7 +1,4 @@
+# dirty hack...
+KEYWORD=$KEYWORD/xfce
+. distro/arch/entry1
 TITLE='Glorious Arch x86_64 (Xfce)'
-_name=garch/xfce
-KERNEL="/liveusb-kernel/$_name/x86_64/vmlinuz"
-INITRD=("/liveusb-kernel/$_name/intel_ucode.img"
-		"/liveusb-kernel/$_name/x86_64/archiso.img")
-OPTION="archisodevice=/dev/disk/by-uuid/$UUID archisobasedir=liveusb-data/$_name iomem=relaxed"
-X64=y
diff --git a/distro/gloriousarch/xfce/install.sh b/distro/gloriousarch/xfce/install.sh
index c443194..8c08576 100644
--- a/distro/gloriousarch/xfce/install.sh
+++ b/distro/gloriousarch/xfce/install.sh
@@ -1,11 +1,3 @@
-_name=garch/xfce
-install_live() {
-	mount_iso
-	install -d "$DATADIR/$_name"
-	install -d "$KERNELDIR/$_name"
-	cp -r "$ISOMNT/arch/x86_64" "$DATADIR/$_name/"
-	cp -r "$ISOMNT/arch/boot/x86_64" "$KERNELDIR/$_name/"
-	cp "$ISOMNT/arch/boot/intel_ucode.img" "$KERNELDIR/$_name/"
-	umount_iso
-}
-
+# dirty hack...
+KEYWORD=$KEYWORD/xfce
+. distro/arch/install.sh
diff --git a/distro/gloriousarch/xfce/isoinfo b/distro/gloriousarch/xfce/isoinfo
index 689b98f..e1fdfc4 100644
--- a/distro/gloriousarch/xfce/isoinfo
+++ b/distro/gloriousarch/xfce/isoinfo
@@ -1,8 +1,8 @@
-_isodate=2018-01-25
+_isodate=2018-12-02
 _desktop=xfce
 ISONAME="$DISTRONAME $_desktop $_isodate"
 ISOURL=garch-$_desktop-$_isodate.iso
-SHA256=9062baf4998a1a5ee9aa4c2989b7f516c2bbc810c2afaac175060363fcccc99f
+SHA256=43a68b62f06a3a7c1f6bfc71d42f8b3c329d38d259a220f5bcb27121ffbf3df4
 
 mirrorlist=(
 https://sourceforge.net/projects/garchiso/files
-- 
cgit v1.2.3