manjaro: update the iso url

drop IA32 and only keep kde and xfce

15 files changed, 6 insertions, 46 deletions

diff --git a/distro/manjaro/32/kde/entry b/distro/manjaro/32/kde/entry
deleted file mode 100644
index bb824ce..0000000
--- a/distro/manjaro/32/kde/entry
+++ /dev/null
@@ -1,3 +0,0 @@
-_arch=i686
-_flavour=KDE
-source distro/manjaro/entry
diff --git a/distro/manjaro/32/kde/install.sh b/distro/manjaro/32/kde/install.sh
deleted file mode 100644
index f3678ea..0000000
--- a/distro/manjaro/32/kde/install.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-ARCH=i686
-source distro/manjaro/install.sh
diff --git a/distro/manjaro/32/kde/isoinfo b/distro/manjaro/32/kde/isoinfo
deleted file mode 100644
index fa00221..0000000
--- a/distro/manjaro/32/kde/isoinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-source distro/manjaro/isoinfo.common
-ISONAME="$DISTRONAME i686 $_isodate KDE"
-ISOURL="release/${_isodate}/kde/manjaro-kde-${_isodate}-i686.iso"
-SHA1=b4fbb8c4d4855e570f09770b596bba4c74620076
diff --git a/distro/manjaro/32/net/entry b/distro/manjaro/32/net/entry
deleted file mode 100644
index d016b63..0000000
--- a/distro/manjaro/32/net/entry
+++ /dev/null
@@ -1,3 +0,0 @@
-_arch=i686
-_flavour=Net
-source distro/manjaro/entry
diff --git a/distro/manjaro/32/net/install.sh b/distro/manjaro/32/net/install.sh
deleted file mode 100644
index f3678ea..0000000
--- a/distro/manjaro/32/net/install.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-ARCH=i686
-source distro/manjaro/install.sh
diff --git a/distro/manjaro/32/net/isoinfo b/distro/manjaro/32/net/isoinfo
deleted file mode 100644
index adf2bae..0000000
--- a/distro/manjaro/32/net/isoinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-source distro/manjaro/isoinfo.common
-ISONAME="$DISTRONAME i686 $_isodate Net install"
-ISOURL="release/${_isodate}/netinstall/manjaro-net-${_isodate}-i686.iso"
-SHA1=9cb6886757771ae4eba83abfab8ac5e6a499da2b
-
diff --git a/distro/manjaro/32/xfce/entry b/distro/manjaro/32/xfce/entry
deleted file mode 100644
index e9a38c0..0000000
--- a/distro/manjaro/32/xfce/entry
+++ /dev/null
@@ -1,3 +0,0 @@
-_arch=i686
-_flavour=Xfce
-source distro/manjaro/entry
diff --git a/distro/manjaro/32/xfce/install.sh b/distro/manjaro/32/xfce/install.sh
deleted file mode 100644
index f3678ea..0000000
--- a/distro/manjaro/32/xfce/install.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-ARCH=i686
-source distro/manjaro/install.sh
diff --git a/distro/manjaro/32/xfce/isoinfo b/distro/manjaro/32/xfce/isoinfo
deleted file mode 100644
index 395c12d..0000000
--- a/distro/manjaro/32/xfce/isoinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-source distro/manjaro/isoinfo.common
-ISONAME="$DISTRONAME i686 $_isodate Xfce"
-ISOURL="release/${_isodate}/xfce/manjaro-xfce-${_isodate}-i686.iso"
-SHA1=b007f8feaf3df6e2cddf6e18479e725045650515
-
diff --git a/distro/manjaro/64/kde/isoinfo b/distro/manjaro/64/kde/isoinfo
index 8681854..bf770be 100644
--- a/distro/manjaro/64/kde/isoinfo
+++ b/distro/manjaro/64/kde/isoinfo
@@ -1,4 +1,4 @@
 source distro/manjaro/isoinfo.common
 ISONAME="$DISTRONAME x86_64 $_isodate KDE"
-ISOURL="release/${_isodate}/kde/manjaro-kde-${_isodate}-x86_64.iso"
-SHA256=8ef73ea7f47194d6d09d3dc7f6c9ae80e8a5251fab332eb123ae4b7fabcc16cc
+ISOURL=manjaro-kde-${_isodate}-stable-x86_64.iso
+SHA256=5399480cafb0e603eed63541e50caf179658b64cec9a53f08272b82af89e8079
diff --git a/distro/manjaro/64/net/entry b/distro/manjaro/64/net/entry
deleted file mode 100644
index d10a733..0000000
--- a/distro/manjaro/64/net/entry
+++ /dev/null
@@ -1,3 +0,0 @@
-_arch=x86_64
-_flavour=Net
-source distro/manjaro/entry
diff --git a/distro/manjaro/64/net/install.sh b/distro/manjaro/64/net/install.sh
deleted file mode 100644
index b042c51..0000000
--- a/distro/manjaro/64/net/install.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-ARCH=x86_64
-source distro/manjaro/install.sh
diff --git a/distro/manjaro/64/net/isoinfo b/distro/manjaro/64/net/isoinfo
deleted file mode 100644
index f9abaa9..0000000
--- a/distro/manjaro/64/net/isoinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-source distro/manjaro/isoinfo.common
-ISONAME="$DISTRONAME x86_64 $_isodate Net install"
-ISOURL="release/${_isodate}/netinstall/manjaro-net-${_isodate}-x86_64.iso"
-SHA1=42e0c1391c63070a76f4840c21368a23fd65d334
-
diff --git a/distro/manjaro/64/xfce/isoinfo b/distro/manjaro/64/xfce/isoinfo
index 2ff5ace..8e5ed3f 100644
--- a/distro/manjaro/64/xfce/isoinfo
+++ b/distro/manjaro/64/xfce/isoinfo
@@ -1,5 +1,4 @@
 source distro/manjaro/isoinfo.common
 ISONAME="$DISTRONAME x86_64 $_isodate Xfce"
-ISOURL="release/${_isodate}/xfce/manjaro-xfce-${_isodate}-x86_64.iso"
-SHA256=eeb3c56f85d75b1d81bb5c61819d3066c2c71ce8cdea0e0108a7889affb76d84
-
+ISOURL="manjaro-xfce-${_isodate}-stable-x86_64.iso"
+SHA256=50069d30304f4c1562786631a840645ace2eec5a9f2a2608c4524368a893ace1
diff --git a/distro/manjaro/isoinfo.common b/distro/manjaro/isoinfo.common
index 37f648b..8c8ab12 100644
--- a/distro/manjaro/isoinfo.common
+++ b/distro/manjaro/isoinfo.common
@@ -1,5 +1,5 @@
-_isodate=16.08
+_isodate=17.1.12
 
 mirrorlist=(
-https://mirrors.tuna.tsinghua.edu.cn/manjaro-cd
+https://osdn.net/dl/manjaro
 )