distro/mint: update to 18.1

8 files changed, 41 insertions, 39 deletions

diff --git a/distro/mint/64/cinnamon/entry b/distro/mint/64/cinnamon/entry
index 8505df3..cdbbfc0 100644
--- a/distro/mint/64/cinnamon/entry
+++ b/distro/mint/64/cinnamon/entry
@@ -1,5 +1,4 @@
-TITLE='Linux Mint 18 x86_64 with Cinnamon Desktop'
-KERNEL=/liveusb-kernel/mint/64/vmlinuz
-INITRD=/liveusb-kernel/mint/64/initrd.lz
-OPTION="file=/cdrom/preseed/linuxmint.seed boot=casper iso-scan/filename=/liveusb-data/mint/$ISOFILE quiet splash --"
-X64=y
+_ver=18.1
+_arch=x86_64
+_de=Cinnamon
+source distro/mint/entry.common
\ No newline at end of file
diff --git a/distro/mint/64/cinnamon/isoinfo b/distro/mint/64/cinnamon/isoinfo
index 559b6c0..421c95b 100644
--- a/distro/mint/64/cinnamon/isoinfo
+++ b/distro/mint/64/cinnamon/isoinfo
@@ -1,8 +1,4 @@
-ISONAME="$DISTRONAME 18 x86_64 (Cinnamon)"
-ISOURL=stable/18/linuxmint-18-cinnamon-64bit.iso
-SHA256=2238dca5b51f9e2674a7e31c46f19141fbdecff6e44c06ecbc9a7bb59b75a816
-
-mirrorlist=(
-https://mirrors.tuna.tsinghua.edu.cn/linuxmint-cd
-http://mirrors.ustc.edu.cn/linuxmint-cd
-)
+source distro/mint/isoinfo.common
+ISONAME="$DISTRONAME ${_isover} x86_64 (Cinnamon)"
+ISOURL=stable/${_isover}/linuxmint-${_isover}-cinnamon-64bit.iso
+SHA256=b99f4b98a1b41737ded072dc1a7060ca32224e23236074790d4fc86b51009e3c
diff --git a/distro/mint/64/mate/entry b/distro/mint/64/mate/entry
index b190746..c097127 100644
--- a/distro/mint/64/mate/entry
+++ b/distro/mint/64/mate/entry
@@ -1,5 +1,4 @@
-TITLE='Linux Mint 18 x86_64 with MATE Desktop'
-KERNEL=/liveusb-kernel/mint/64/vmlinuz
-INITRD=/liveusb-kernel/mint/64/initrd.lz
-OPTION="file=/cdrom/preseed/linuxmint.seed boot=casper iso-scan/filename=/liveusb-data/mint/$ISOFILE quiet splash --"
-X64=y
+_ver=18.1
+_arch=x86_64
+_de=MATE
+source distro/mint/entry.common
diff --git a/distro/mint/64/mate/isoinfo b/distro/mint/64/mate/isoinfo
index 2761d40..0d2d662 100644
--- a/distro/mint/64/mate/isoinfo
+++ b/distro/mint/64/mate/isoinfo
@@ -1,8 +1,4 @@
-ISONAME="$DISTRONAME 18 x86_64 (MATE)"
-ISOURL=stable/18/linuxmint-18-mate-64bit.iso
-SHA256=c634f48b248489eef782067484a04978f046e9ccd507d9df35c798a1db9bef22
-
-mirrorlist=(
-https://mirrors.tuna.tsinghua.edu.cn/linuxmint-cd
-http://mirrors.ustc.edu.cn/linuxmint-cd
-)
+source distro/mint/isoinfo.common
+ISONAME="$DISTRONAME ${_isover} x86_64 (MATE)"
+ISOURL=stable/${_isover}/linuxmint-${_isover}-mate-64bit.iso
+SHA256=b41c5258c03bd8fe4ecab5f1db33f4484bd1992ec306ea4bdde25fc7d6ea2f40
diff --git a/distro/mint/64/xfce/entry b/distro/mint/64/xfce/entry
index eafcd4c..749ba3d 100644
--- a/distro/mint/64/xfce/entry
+++ b/distro/mint/64/xfce/entry
@@ -1,5 +1,4 @@
-TITLE='Linux Mint 18 x86_64 with Xfce Desktop'
-KERNEL=/liveusb-kernel/mint/64/vmlinuz
-INITRD=/liveusb-kernel/mint/64/initrd.lz
-OPTION="file=/cdrom/preseed/linuxmint.seed boot=casper iso-scan/filename=/liveusb-data/mint/$ISOFILE quiet splash --"
-X64=y
+_ver=18.1
+_arch=x86_64
+_de=Xfce
+source distro/mint/entry.common
diff --git a/distro/mint/64/xfce/isoinfo b/distro/mint/64/xfce/isoinfo
index 3240c95..9376267 100644
--- a/distro/mint/64/xfce/isoinfo
+++ b/distro/mint/64/xfce/isoinfo
@@ -1,8 +1,4 @@
-ISONAME="$DISTRONAME 18 x86_64 (Xfce)"
-ISOURL=stable/18/linuxmint-18-xfce-64bit.iso
-SHA256=2151852abb34bd62350fab807acc04b3f337d928c7c8092aebea7d0524587acf
-
-mirrorlist=(
-https://mirrors.tuna.tsinghua.edu.cn/linuxmint-cd
-http://mirrors.ustc.edu.cn/linuxmint-cd
-)
+source distro/mint/isoinfo.common
+ISONAME="$DISTRONAME ${_isover} x86_64 (Xfce)"
+ISOURL=stable/${_isover}/linuxmint-${_isover}-xfce-64bit.iso
+SHA256=7dc167bd5e6e28641c8aaaf406bba46b1be2d472f85d1d86280ed80e19bb8462
diff --git a/distro/mint/entry.common b/distro/mint/entry.common
new file mode 100644
index 0000000..88d6b5b
--- /dev/null
+++ b/distro/mint/entry.common
@@ -0,0 +1,11 @@
+TITLE="Linux Mint $_ver $_arch with $_de Desktop"
+if [[ "$_arch" == x86_64 ]]; then
+   _bit=64
+   X64=y
+else
+   _bit=32
+   X64=n
+fi
+KERNEL=/liveusb-kernel/mint/$_bit/vmlinuz
+INITRD=/liveusb-kernel/mint/$_bit/initrd.lz
+OPTION="file=/cdrom/preseed/linuxmint.seed boot=casper iso-scan/filename=/liveusb-data/mint/$ISOFILE quiet splash --"
diff --git a/distro/mint/isoinfo.common b/distro/mint/isoinfo.common
new file mode 100644
index 0000000..996edfe
--- /dev/null
+++ b/distro/mint/isoinfo.common
@@ -0,0 +1,6 @@
+_isover=18.1
+
+mirrorlist=(
+https://mirrors.tuna.tsinghua.edu.cn/linuxmint-cd
+http://mirrors.ustc.edu.cn/linuxmint-cd
+)