From d2d67a1eb569d8770e571417046c7658502a1ff3 Mon Sep 17 00:00:00 2001
From: Iru Cai <mytbk920423@gmail.com>
Date: Wed, 24 Oct 2018 21:06:17 +0800
Subject: distro/mint: use the v2 iso, reuse the Ubuntu install.sh

---
 distro/mint/64/cinnamon/entry      |  1 +
 distro/mint/64/cinnamon/install.sh |  1 +
 distro/mint/64/cinnamon/isoinfo    |  4 ++--
 distro/mint/64/install.sh          | 11 +++--------
 distro/mint/64/mate/entry          |  1 +
 distro/mint/64/mate/install.sh     |  1 +
 distro/mint/64/mate/isoinfo        |  4 ++--
 distro/mint/64/xfce/entry          |  1 +
 distro/mint/64/xfce/install.sh     |  1 +
 distro/mint/64/xfce/isoinfo        |  4 ++--
 distro/mint/entry.common           |  5 ++---
 11 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/distro/mint/64/cinnamon/entry b/distro/mint/64/cinnamon/entry
index 66b34bb..62b16a1 100644
--- a/distro/mint/64/cinnamon/entry
+++ b/distro/mint/64/cinnamon/entry
@@ -1,3 +1,4 @@
 _arch=x86_64
+_ver=19
 _de=Cinnamon
 source distro/mint/entry.common
diff --git a/distro/mint/64/cinnamon/install.sh b/distro/mint/64/cinnamon/install.sh
index 1854007..24f773f 100644
--- a/distro/mint/64/cinnamon/install.sh
+++ b/distro/mint/64/cinnamon/install.sh
@@ -1 +1,2 @@
+_ver=19/Cinnamon
 source distro/mint/64/install.sh
diff --git a/distro/mint/64/cinnamon/isoinfo b/distro/mint/64/cinnamon/isoinfo
index 3670aec..bb9c34b 100644
--- a/distro/mint/64/cinnamon/isoinfo
+++ b/distro/mint/64/cinnamon/isoinfo
@@ -1,4 +1,4 @@
 source distro/mint/isoinfo.common
 ISONAME="$DISTRONAME ${_isover} x86_64 (Cinnamon)"
-ISOURL=stable/${_isover}/linuxmint-${_isover}-cinnamon-64bit.iso
-SHA256=41dd237ed33a4cc5865ef52cd92b479cded0a9341956de4d6adb794e9c1c10a9
+ISOURL=stable/${_isover}/linuxmint-${_isover}-cinnamon-64bit-v2.iso
+SHA256=c92a9baafdd599da057a97236f0a853ce1f8b3c7ad41e652ceba493f9ca5623f
diff --git a/distro/mint/64/install.sh b/distro/mint/64/install.sh
index a94793d..c01029a 100644
--- a/distro/mint/64/install.sh
+++ b/distro/mint/64/install.sh
@@ -1,8 +1,3 @@
-install_live() {
-	install -d "$KERNELDIR/mint/64" "$DATADIR/mint"
-	cp "$ISOPATH/$ISOFILE" "$DATADIR/mint/"
-	mount_iso
-	cp "$ISOMNT/casper/vmlinuz" "$ISOMNT/casper/initrd.lz" "$KERNELDIR/mint/64/"
-	umount_iso
-}
-
+VMLINUZ=vmlinuz
+INITRD=initrd.lz
+source distro/ubuntu/install.sh
diff --git a/distro/mint/64/mate/entry b/distro/mint/64/mate/entry
index 8414a5e..3e15eec 100644
--- a/distro/mint/64/mate/entry
+++ b/distro/mint/64/mate/entry
@@ -1,3 +1,4 @@
 _arch=x86_64
+_ver=19
 _de=MATE
 source distro/mint/entry.common
diff --git a/distro/mint/64/mate/install.sh b/distro/mint/64/mate/install.sh
index 1854007..2fbc57e 100644
--- a/distro/mint/64/mate/install.sh
+++ b/distro/mint/64/mate/install.sh
@@ -1 +1,2 @@
+_ver=19/MATE
 source distro/mint/64/install.sh
diff --git a/distro/mint/64/mate/isoinfo b/distro/mint/64/mate/isoinfo
index c8c4097..2faf1be 100644
--- a/distro/mint/64/mate/isoinfo
+++ b/distro/mint/64/mate/isoinfo
@@ -1,4 +1,4 @@
 source distro/mint/isoinfo.common
 ISONAME="$DISTRONAME ${_isover} x86_64 (MATE)"
-ISOURL=stable/${_isover}/linuxmint-${_isover}-mate-64bit.iso
-SHA256=a5f9893d2960eaea1a4d35a86c1d2a627a2a8ee3e578f01514ab75c8ef323a8d
+ISOURL=stable/${_isover}/linuxmint-${_isover}-mate-64bit-v2.iso
+SHA256=f8164654b7600ced1aa8ef6abee2e56620388b0baa161d7b17699f425223d7c7
diff --git a/distro/mint/64/xfce/entry b/distro/mint/64/xfce/entry
index cbb3f61..a456f09 100644
--- a/distro/mint/64/xfce/entry
+++ b/distro/mint/64/xfce/entry
@@ -1,3 +1,4 @@
 _arch=x86_64
+_ver=19
 _de=Xfce
 source distro/mint/entry.common
diff --git a/distro/mint/64/xfce/install.sh b/distro/mint/64/xfce/install.sh
index 1854007..cfd6f31 100644
--- a/distro/mint/64/xfce/install.sh
+++ b/distro/mint/64/xfce/install.sh
@@ -1 +1,2 @@
+_ver=19/Xfce
 source distro/mint/64/install.sh
diff --git a/distro/mint/64/xfce/isoinfo b/distro/mint/64/xfce/isoinfo
index 7f55127..b36ab2f 100644
--- a/distro/mint/64/xfce/isoinfo
+++ b/distro/mint/64/xfce/isoinfo
@@ -1,4 +1,4 @@
 source distro/mint/isoinfo.common
 ISONAME="$DISTRONAME ${_isover} x86_64 (Xfce)"
-ISOURL=stable/${_isover}/linuxmint-${_isover}-xfce-64bit.iso
-SHA256=772786adad318c0571ff621fe13e66ebde1366557d0579bd045a3c649ffb917a
+ISOURL=stable/${_isover}/linuxmint-${_isover}-xfce-64bit-v2.iso
+SHA256=c996a0de1e010476f36ed55322cb055b07d3bd507f0c60eff65b07634f20f897
diff --git a/distro/mint/entry.common b/distro/mint/entry.common
index c04ed8e..18ed6be 100644
--- a/distro/mint/entry.common
+++ b/distro/mint/entry.common
@@ -1,4 +1,3 @@
-_ver=19
 TITLE="Linux Mint $_ver $_arch with $_de Desktop"
 if [[ "$_arch" == x86_64 ]]; then
    _bit=64
@@ -7,6 +6,6 @@ else
    _bit=32
    X64=n
 fi
-KERNEL=/liveusb-kernel/mint/$_bit/vmlinuz
-INITRD=/liveusb-kernel/mint/$_bit/initrd.lz
+KERNEL=/liveusb-kernel/mint/$_ver/$_de/$_bit/vmlinuz
+INITRD=/liveusb-kernel/mint/$_ver/$_de/$_bit/initrd.lz
 OPTION="file=/cdrom/preseed/linuxmint.seed boot=casper iso-scan/filename=/liveusb-data/mint/$ISOFILE quiet splash --"
-- 
cgit v1.2.3