From 12e54ab1c91ac4f96ee0a99cb6087434213a0fa9 Mon Sep 17 00:00:00 2001
From: Iru Cai <mytbk920423@gmail.com>
Date: Mon, 31 Dec 2018 00:03:12 +0800
Subject: manjaro 18.0.1

---
 distro/manjaro/64/kde/entry       | 3 ---
 distro/manjaro/64/kde/install.sh  | 2 --
 distro/manjaro/64/kde/isoinfo     | 4 ----
 distro/manjaro/64/xfce/entry      | 3 ---
 distro/manjaro/64/xfce/install.sh | 2 --
 distro/manjaro/64/xfce/isoinfo    | 4 ----
 distro/manjaro/gnome/entry        | 3 +++
 distro/manjaro/gnome/install.sh   | 2 ++
 distro/manjaro/gnome/isoinfo      | 4 ++++
 distro/manjaro/isoinfo.common     | 2 +-
 distro/manjaro/kde/entry          | 3 +++
 distro/manjaro/kde/install.sh     | 2 ++
 distro/manjaro/kde/isoinfo        | 4 ++++
 distro/manjaro/xfce/entry         | 3 +++
 distro/manjaro/xfce/install.sh    | 2 ++
 distro/manjaro/xfce/isoinfo       | 4 ++++
 16 files changed, 28 insertions(+), 19 deletions(-)
 delete mode 100644 distro/manjaro/64/kde/entry
 delete mode 100644 distro/manjaro/64/kde/install.sh
 delete mode 100644 distro/manjaro/64/kde/isoinfo
 delete mode 100644 distro/manjaro/64/xfce/entry
 delete mode 100644 distro/manjaro/64/xfce/install.sh
 delete mode 100644 distro/manjaro/64/xfce/isoinfo
 create mode 100644 distro/manjaro/gnome/entry
 create mode 100644 distro/manjaro/gnome/install.sh
 create mode 100644 distro/manjaro/gnome/isoinfo
 create mode 100644 distro/manjaro/kde/entry
 create mode 100644 distro/manjaro/kde/install.sh
 create mode 100644 distro/manjaro/kde/isoinfo
 create mode 100644 distro/manjaro/xfce/entry
 create mode 100644 distro/manjaro/xfce/install.sh
 create mode 100644 distro/manjaro/xfce/isoinfo

diff --git a/distro/manjaro/64/kde/entry b/distro/manjaro/64/kde/entry
deleted file mode 100644
index 7cc5a9f..0000000
--- a/distro/manjaro/64/kde/entry
+++ /dev/null
@@ -1,3 +0,0 @@
-_arch=x86_64
-_flavour=KDE
-source distro/manjaro/entry
diff --git a/distro/manjaro/64/kde/install.sh b/distro/manjaro/64/kde/install.sh
deleted file mode 100644
index b042c51..0000000
--- a/distro/manjaro/64/kde/install.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-ARCH=x86_64
-source distro/manjaro/install.sh
diff --git a/distro/manjaro/64/kde/isoinfo b/distro/manjaro/64/kde/isoinfo
deleted file mode 100644
index bf770be..0000000
--- a/distro/manjaro/64/kde/isoinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-source distro/manjaro/isoinfo.common
-ISONAME="$DISTRONAME x86_64 $_isodate KDE"
-ISOURL=manjaro-kde-${_isodate}-stable-x86_64.iso
-SHA256=5399480cafb0e603eed63541e50caf179658b64cec9a53f08272b82af89e8079
diff --git a/distro/manjaro/64/xfce/entry b/distro/manjaro/64/xfce/entry
deleted file mode 100644
index 5b500a5..0000000
--- a/distro/manjaro/64/xfce/entry
+++ /dev/null
@@ -1,3 +0,0 @@
-_arch=x86_64
-_flavour=Xfce
-source distro/manjaro/entry
diff --git a/distro/manjaro/64/xfce/install.sh b/distro/manjaro/64/xfce/install.sh
deleted file mode 100644
index b042c51..0000000
--- a/distro/manjaro/64/xfce/install.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-ARCH=x86_64
-source distro/manjaro/install.sh
diff --git a/distro/manjaro/64/xfce/isoinfo b/distro/manjaro/64/xfce/isoinfo
deleted file mode 100644
index 8e5ed3f..0000000
--- a/distro/manjaro/64/xfce/isoinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-source distro/manjaro/isoinfo.common
-ISONAME="$DISTRONAME x86_64 $_isodate Xfce"
-ISOURL="manjaro-xfce-${_isodate}-stable-x86_64.iso"
-SHA256=50069d30304f4c1562786631a840645ace2eec5a9f2a2608c4524368a893ace1
diff --git a/distro/manjaro/gnome/entry b/distro/manjaro/gnome/entry
new file mode 100644
index 0000000..74835a4
--- /dev/null
+++ b/distro/manjaro/gnome/entry
@@ -0,0 +1,3 @@
+_arch=x86_64
+_flavour=GNOME
+source distro/manjaro/entry
diff --git a/distro/manjaro/gnome/install.sh b/distro/manjaro/gnome/install.sh
new file mode 100644
index 0000000..b042c51
--- /dev/null
+++ b/distro/manjaro/gnome/install.sh
@@ -0,0 +1,2 @@
+ARCH=x86_64
+source distro/manjaro/install.sh
diff --git a/distro/manjaro/gnome/isoinfo b/distro/manjaro/gnome/isoinfo
new file mode 100644
index 0000000..0d77695
--- /dev/null
+++ b/distro/manjaro/gnome/isoinfo
@@ -0,0 +1,4 @@
+source distro/manjaro/isoinfo.common
+ISONAME="$DISTRONAME x86_64 $_isodate GNOME"
+ISOURL=manjaro-gnome-${_isodate}-stable-x86_64.iso
+SHA256=6bf32f861b339b552a5addc6bb664f7c4e5239de5dc34b0782cb292ceda32da3
diff --git a/distro/manjaro/isoinfo.common b/distro/manjaro/isoinfo.common
index 8c8ab12..f57087f 100644
--- a/distro/manjaro/isoinfo.common
+++ b/distro/manjaro/isoinfo.common
@@ -1,4 +1,4 @@
-_isodate=17.1.12
+_isodate=18.0.1
 
 mirrorlist=(
 https://osdn.net/dl/manjaro
diff --git a/distro/manjaro/kde/entry b/distro/manjaro/kde/entry
new file mode 100644
index 0000000..7cc5a9f
--- /dev/null
+++ b/distro/manjaro/kde/entry
@@ -0,0 +1,3 @@
+_arch=x86_64
+_flavour=KDE
+source distro/manjaro/entry
diff --git a/distro/manjaro/kde/install.sh b/distro/manjaro/kde/install.sh
new file mode 100644
index 0000000..b042c51
--- /dev/null
+++ b/distro/manjaro/kde/install.sh
@@ -0,0 +1,2 @@
+ARCH=x86_64
+source distro/manjaro/install.sh
diff --git a/distro/manjaro/kde/isoinfo b/distro/manjaro/kde/isoinfo
new file mode 100644
index 0000000..e8530c5
--- /dev/null
+++ b/distro/manjaro/kde/isoinfo
@@ -0,0 +1,4 @@
+source distro/manjaro/isoinfo.common
+ISONAME="$DISTRONAME x86_64 $_isodate KDE"
+ISOURL=manjaro-kde-${_isodate}-stable-x86_64.iso
+SHA256=8969017a31431c3fb51c38f05750abc7252136d3eb8dcf463186772ed920ccb4
diff --git a/distro/manjaro/xfce/entry b/distro/manjaro/xfce/entry
new file mode 100644
index 0000000..5b500a5
--- /dev/null
+++ b/distro/manjaro/xfce/entry
@@ -0,0 +1,3 @@
+_arch=x86_64
+_flavour=Xfce
+source distro/manjaro/entry
diff --git a/distro/manjaro/xfce/install.sh b/distro/manjaro/xfce/install.sh
new file mode 100644
index 0000000..b042c51
--- /dev/null
+++ b/distro/manjaro/xfce/install.sh
@@ -0,0 +1,2 @@
+ARCH=x86_64
+source distro/manjaro/install.sh
diff --git a/distro/manjaro/xfce/isoinfo b/distro/manjaro/xfce/isoinfo
new file mode 100644
index 0000000..06ab764
--- /dev/null
+++ b/distro/manjaro/xfce/isoinfo
@@ -0,0 +1,4 @@
+source distro/manjaro/isoinfo.common
+ISONAME="$DISTRONAME x86_64 $_isodate Xfce"
+ISOURL="manjaro-xfce-${_isodate}-stable-x86_64.iso"
+SHA256=241e8f812b80cbbbe936e512653404df6b439208ffc3a695208580d56eb33bdb
-- 
cgit v1.2.3