From d57a360f401f710e9f33595176994c742d23548f Mon Sep 17 00:00:00 2001
From: Iru Cai <mytbk920423@gmail.com>
Date: Sat, 6 Jan 2018 23:48:38 +0800
Subject: update arch and gloriousarch

---
 distro/arch/isoinfo                 |  4 ++--
 distro/gloriousarch/mate/entry1     |  7 +++++++
 distro/gloriousarch/mate/install.sh | 11 +++++++++++
 distro/gloriousarch/mate/isoinfo    |  9 +++++++++
 distro/gloriousarch/xfce/entry1     |  2 +-
 distro/gloriousarch/xfce/isoinfo    |  6 +++---
 6 files changed, 33 insertions(+), 6 deletions(-)
 create mode 100644 distro/gloriousarch/mate/entry1
 create mode 100644 distro/gloriousarch/mate/install.sh
 create mode 100644 distro/gloriousarch/mate/isoinfo

diff --git a/distro/arch/isoinfo b/distro/arch/isoinfo
index 33dff3f..cf06ef8 100644
--- a/distro/arch/isoinfo
+++ b/distro/arch/isoinfo
@@ -1,7 +1,7 @@
-_isodate=2017.09.01
+_isodate=2018.01.01
 ISONAME="$DISTRONAME $_isodate"
 ISOURL=iso/$_isodate/archlinux-$_isodate-x86_64.iso
-SHA1=b0490c8471e3059bf1e3759ade38a63570b301ae
+SHA1=6c98c1932731eff98e430958c3589c4124bafbe9
 
 mirrorlist=(
 https://mirrors.tuna.tsinghua.edu.cn/archlinux
diff --git a/distro/gloriousarch/mate/entry1 b/distro/gloriousarch/mate/entry1
new file mode 100644
index 0000000..188a3b7
--- /dev/null
+++ b/distro/gloriousarch/mate/entry1
@@ -0,0 +1,7 @@
+TITLE='Glorious Arch x86_64 (MATE)'
+_name=garch/mate
+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"
+X64=y
diff --git a/distro/gloriousarch/mate/install.sh b/distro/gloriousarch/mate/install.sh
new file mode 100644
index 0000000..0c0e642
--- /dev/null
+++ b/distro/gloriousarch/mate/install.sh
@@ -0,0 +1,11 @@
+_name=garch/mate
+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
+}
+
diff --git a/distro/gloriousarch/mate/isoinfo b/distro/gloriousarch/mate/isoinfo
new file mode 100644
index 0000000..8ca25c4
--- /dev/null
+++ b/distro/gloriousarch/mate/isoinfo
@@ -0,0 +1,9 @@
+_isodate=2018-01-06
+_desktop=mate
+ISONAME="$DISTRONAME $_desktop $_isodate"
+ISOURL=garch-$_desktop-$_isodate.iso
+SHA256=2b830d2b3521c11a1802041f23cbf7cd926a4a89c7e541c541f8ff45a90a9bd7
+
+mirrorlist=(
+https://sourceforge.net/projects/garchiso/files
+)
diff --git a/distro/gloriousarch/xfce/entry1 b/distro/gloriousarch/xfce/entry1
index 8275c5a..6cabe21 100644
--- a/distro/gloriousarch/xfce/entry1
+++ b/distro/gloriousarch/xfce/entry1
@@ -1,4 +1,4 @@
-TITLE='Glorious Arch x86_64'
+TITLE='Glorious Arch x86_64 (Xfce)'
 _name=garch/xfce
 KERNEL="/liveusb-kernel/$_name/x86_64/vmlinuz"
 INITRD=("/liveusb-kernel/$_name/intel_ucode.img"
diff --git a/distro/gloriousarch/xfce/isoinfo b/distro/gloriousarch/xfce/isoinfo
index 3d281f9..1a93037 100644
--- a/distro/gloriousarch/xfce/isoinfo
+++ b/distro/gloriousarch/xfce/isoinfo
@@ -1,8 +1,8 @@
-_isodate=20170923
+_isodate=2018-01-06
 _desktop=xfce
 ISONAME="$DISTRONAME $_desktop $_isodate"
-ISOURL=gloriousarch-$_desktop-$_isodate.iso
-SHA256=b6e3b64005ecf9c6e78297fad72e737fc7a0f7ff68700cdac9f221e1b2f7faa4
+ISOURL=garch-$_desktop-$_isodate.iso
+SHA256=6221d8863c74843f61c65f58b6a16baaa7f85a41fec79d4e9a40a9d4fafef4c0
 
 mirrorlist=(
 https://sourceforge.net/projects/garchiso/files
-- 
cgit v1.2.3