mint 20.12021.04

14 files changed, 30 insertions, 23 deletions

diff --git a/distro/mint/cinnamon/config b/distro/mint/cinnamon/config
new file mode 100644
index 0000000..757ec71
--- /dev/null
+++ b/distro/mint/cinnamon/config
@@ -0,0 +1,3 @@
+_arch=x86_64
+_ver=20.1
+_de=Cinnamon
diff --git a/distro/mint/cinnamon/entry b/distro/mint/cinnamon/entry
index fc51998..9ad0df1 100644
--- a/distro/mint/cinnamon/entry
+++ b/distro/mint/cinnamon/entry
@@ -1,4 +1,2 @@
-_arch=x86_64
-_ver=20
-_de=Cinnamon
+source distro/mint/cinnamon/config
 source distro/mint/entry.common
diff --git a/distro/mint/cinnamon/install.sh b/distro/mint/cinnamon/install.sh
index 25e3293..41b41ec 100644
--- a/distro/mint/cinnamon/install.sh
+++ b/distro/mint/cinnamon/install.sh
@@ -1,2 +1,3 @@
-_ver=20/Cinnamon
+source distro/mint/cinnamon/config
+_ver="${_ver}/${_de}"
 source distro/mint/install.sh
diff --git a/distro/mint/cinnamon/isoinfo b/distro/mint/cinnamon/isoinfo
index bde80e6..b74471e 100644
--- a/distro/mint/cinnamon/isoinfo
+++ b/distro/mint/cinnamon/isoinfo
@@ -1,3 +1,4 @@
+source distro/mint/cinnamon/config
 source distro/mint/isoinfo.common
-ISONAME="$DISTRONAME ${_isover} x86_64 (Cinnamon)"
-ISOURL=stable/${_isover}/linuxmint-${_isover}-cinnamon-64bit.iso
+ISONAME="$DISTRONAME ${_ver} x86_64 (${_de})"
+ISOURL=stable/${_ver}/linuxmint-${_ver}-cinnamon-64bit.iso
diff --git a/distro/mint/isoinfo.common b/distro/mint/isoinfo.common
index d337744..4c3162d 100644
--- a/distro/mint/isoinfo.common
+++ b/distro/mint/isoinfo.common
@@ -1,5 +1,3 @@
-_isover=20
-
 HASHTOOL=sha256sum
 HASHFILE=distro/mint/sha256sum.txt
 VERIFY=hashfile
diff --git a/distro/mint/mate/config b/distro/mint/mate/config
new file mode 100644
index 0000000..15e3460
--- /dev/null
+++ b/distro/mint/mate/config
@@ -0,0 +1,3 @@
+_arch=x86_64
+_ver=20.1
+_de=MATE
diff --git a/distro/mint/mate/entry b/distro/mint/mate/entry
index 43fd4d6..f99887b 100644
--- a/distro/mint/mate/entry
+++ b/distro/mint/mate/entry
@@ -1,4 +1,2 @@
-_arch=x86_64
-_ver=20
-_de=MATE
+source distro/mint/mate/config
 source distro/mint/entry.common
diff --git a/distro/mint/mate/install.sh b/distro/mint/mate/install.sh
index 8be448b..cd85b56 100644
--- a/distro/mint/mate/install.sh
+++ b/distro/mint/mate/install.sh
@@ -1,2 +1,3 @@
-_ver=20/MATE
+source distro/mint/mate/config
+_ver="${_ver}/${_de}"
 source distro/mint/install.sh
diff --git a/distro/mint/mate/isoinfo b/distro/mint/mate/isoinfo
index 5220815..d7bfb48 100644
--- a/distro/mint/mate/isoinfo
+++ b/distro/mint/mate/isoinfo
@@ -1,3 +1,4 @@
+source distro/mint/mate/config
 source distro/mint/isoinfo.common
-ISONAME="$DISTRONAME ${_isover} x86_64 (MATE)"
-ISOURL=stable/${_isover}/linuxmint-${_isover}-mate-64bit.iso
+ISONAME="$DISTRONAME ${_ver} x86_64 (${_de})"
+ISOURL=stable/${_ver}/linuxmint-${_ver}-mate-64bit.iso
diff --git a/distro/mint/sha256sum.txt b/distro/mint/sha256sum.txt
index fc79543..37ed80e 100644
--- a/distro/mint/sha256sum.txt
+++ b/distro/mint/sha256sum.txt
@@ -1,3 +1,3 @@
-2f6ae466ec9b7c6255e997b82f162ae88bfe640a8df16d3e2f495b6281120af9 *linuxmint-20-cinnamon-64bit.iso
-42fd764b3a3544a36d820f4164bb64aa5a6d982073e6d1afdea4853d3858fc98 *linuxmint-20-mate-64bit.iso
-761fb276da9746a068f4c8aa42e8d4981f352db92babe0ef8a08713eeb38246f *linuxmint-20-xfce-64bit.iso
+14f73c93f75e873f4ac70b6cddc83703755c2421135a8fbbfd6ccfeed107e971 *linuxmint-20.1-cinnamon-64bit.iso
+12ccfa2494acf761b2f5a3379ed770495d97051c3944571d5ad5e7c50d11c975 *linuxmint-20.1-mate-64bit.iso
+4f9cc6fa8a2d6fd7ffdf88478812ff994e36470ecfe50761f7efd56e6d3d7018 *linuxmint-20.1-xfce-64bit.iso
diff --git a/distro/mint/xfce/config b/distro/mint/xfce/config
new file mode 100644
index 0000000..5dc8373
--- /dev/null
+++ b/distro/mint/xfce/config
@@ -0,0 +1,3 @@
+_arch=x86_64
+_ver=20.1
+_de=Xfce
diff --git a/distro/mint/xfce/entry b/distro/mint/xfce/entry
index 30ba0c9..e896473 100644
--- a/distro/mint/xfce/entry
+++ b/distro/mint/xfce/entry
@@ -1,4 +1,2 @@
-_arch=x86_64
-_ver=20
-_de=Xfce
+source distro/mint/xfce/config
 source distro/mint/entry.common
diff --git a/distro/mint/xfce/install.sh b/distro/mint/xfce/install.sh
index d8c22ff..eae0ed6 100644
--- a/distro/mint/xfce/install.sh
+++ b/distro/mint/xfce/install.sh
@@ -1,2 +1,3 @@
-_ver=20/Xfce
+source distro/mint/xfce/config
+_ver="${_ver}/${_de}"
 source distro/mint/install.sh
diff --git a/distro/mint/xfce/isoinfo b/distro/mint/xfce/isoinfo
index 415c132..4801841 100644
--- a/distro/mint/xfce/isoinfo
+++ b/distro/mint/xfce/isoinfo
@@ -1,3 +1,4 @@
+source distro/mint/xfce/config
 source distro/mint/isoinfo.common
-ISONAME="$DISTRONAME ${_isover} x86_64 (Xfce)"
-ISOURL=stable/${_isover}/linuxmint-${_isover}-xfce-64bit.iso
+ISONAME="$DISTRONAME ${_ver} x86_64 (${_de})"
+ISOURL=stable/${_ver}/linuxmint-${_ver}-xfce-64bit.iso