add $DISTRONAME and $ISONAME

16 files changed, 31 insertions, 4 deletions

diff --git a/distro/arch/distroinfo b/distro/arch/distroinfo
new file mode 100644
index 0000000..8ad5a35
--- /dev/null
+++ b/distro/arch/distroinfo
@@ -0,0 +1,2 @@
+DISTRONAME='Arch Linux'
+KEYWORD='arch'
diff --git a/distro/arch/isoinfo b/distro/arch/isoinfo
index 7dff318..e5d1529 100644
--- a/distro/arch/isoinfo
+++ b/distro/arch/isoinfo
@@ -1,4 +1,6 @@
-ISOURL=iso/2016.08.01/archlinux-2016.08.01-dual.iso
+_isodate=2016.08.01
+ISONAME="$DISTRONAME $_isodate"
+ISOURL=iso/$_isodate/archlinux-$_isodate-dual.iso
 SHA1=6db5a9e46267ba7ec4d9ae79d141e5a6d9d3cf88
 
 mirrorlist=(
diff --git a/distro/fedora/distroinfo b/distro/fedora/distroinfo
new file mode 100644
index 0000000..d0ad684
--- /dev/null
+++ b/distro/fedora/distroinfo
@@ -0,0 +1,2 @@
+DISTRONAME='Fedora'
+KEYWORD='fedora'
diff --git a/distro/fedora/isoinfo b/distro/fedora/isoinfo
index 7557fd0..d2ecc7d 100644
--- a/distro/fedora/isoinfo
+++ b/distro/fedora/isoinfo
@@ -1,3 +1,4 @@
+ISONAME="$DISTRONAME 24 Workstation"
 ISOURL=releases/24/Workstation/x86_64/iso/Fedora-Workstation-Live-x86_64-24-1.2.iso
 SHA256=8e12d7ba1fcf3328b8514d627788ee0146c0eef75a5e27f0674ee1fe4f1feaf6
 
diff --git a/distro/mint/64/cinnamon/isoinfo b/distro/mint/64/cinnamon/isoinfo
index 92c857e..559b6c0 100644
--- a/distro/mint/64/cinnamon/isoinfo
+++ b/distro/mint/64/cinnamon/isoinfo
@@ -1,3 +1,4 @@
+ISONAME="$DISTRONAME 18 x86_64 (Cinnamon)"
 ISOURL=stable/18/linuxmint-18-cinnamon-64bit.iso
 SHA256=2238dca5b51f9e2674a7e31c46f19141fbdecff6e44c06ecbc9a7bb59b75a816
 
diff --git a/distro/mint/64/mate/isoinfo b/distro/mint/64/mate/isoinfo
index 11dbed4..2761d40 100644
--- a/distro/mint/64/mate/isoinfo
+++ b/distro/mint/64/mate/isoinfo
@@ -1,3 +1,4 @@
+ISONAME="$DISTRONAME 18 x86_64 (MATE)"
 ISOURL=stable/18/linuxmint-18-mate-64bit.iso
 SHA256=c634f48b248489eef782067484a04978f046e9ccd507d9df35c798a1db9bef22
 
diff --git a/distro/mint/64/xfce/isoinfo b/distro/mint/64/xfce/isoinfo
index e56cefe..3240c95 100644
--- a/distro/mint/64/xfce/isoinfo
+++ b/distro/mint/64/xfce/isoinfo
@@ -1,3 +1,4 @@
+ISONAME="$DISTRONAME 18 x86_64 (Xfce)"
 ISOURL=stable/18/linuxmint-18-xfce-64bit.iso
 SHA256=2151852abb34bd62350fab807acc04b3f337d928c7c8092aebea7d0524587acf
 
diff --git a/distro/mint/distroinfo b/distro/mint/distroinfo
new file mode 100644
index 0000000..cb9ebc4
--- /dev/null
+++ b/distro/mint/distroinfo
@@ -0,0 +1,2 @@
+DISTRONAME='Linux Mint'
+KEYWORD='mint'
diff --git a/distro/parabola/distroinfo b/distro/parabola/distroinfo
new file mode 100644
index 0000000..795ca5d
--- /dev/null
+++ b/distro/parabola/distroinfo
@@ -0,0 +1,2 @@
+DISTRONAME='Parabola GNU/Linux-libre'
+KEYWORD='parabola'
diff --git a/distro/parabola/isoinfo b/distro/parabola/isoinfo
index 84a23c8..aaebaeb 100644
--- a/distro/parabola/isoinfo
+++ b/distro/parabola/isoinfo
@@ -1,4 +1,6 @@
-ISOURL=iso/2016.07.27/parabola-2016.07.27-dual.iso
+_isodate=2016.07.27
+ISONAME="$DISTRONAME $_isodate"
+ISOURL="iso/_isodate/parabola-_isodate-dual.iso"
 SHA512=f446bf52dd5b0fd6ad7a5294e257634c09f06d6eb9831703e602238821d03bc7cd87a208c33d969176e297fa2da06fb1c919bb75625e5ff71b0bf2eb7db1f1fa
 
 mirrorlist=(
diff --git a/distro/systemrescuecd/distroinfo b/distro/systemrescuecd/distroinfo
new file mode 100644
index 0000000..db7c45d
--- /dev/null
+++ b/distro/systemrescuecd/distroinfo
@@ -0,0 +1,2 @@
+DISTRONAME='SystemRescueCd'
+KEYWORD='sysrcd'
diff --git a/distro/systemrescuecd/isoinfo b/distro/systemrescuecd/isoinfo
index abf88e0..ed40d46 100644
--- a/distro/systemrescuecd/isoinfo
+++ b/distro/systemrescuecd/isoinfo
@@ -1,4 +1,6 @@
-ISOURL=sysresccd-x86/4.8.0/systemrescuecd-x86-4.8.0.iso
+_isover=4.8.0
+ISONAME="$DISTRONAME $_isover"
+ISOURL=sysresccd-x86/$_isover/systemrescuecd-x86-$_isover.iso
 SHA256=06e6847384063bbb67c1c8f0824e995046c9ff125ad07a4214b129efb9b18241
 
 mirrorlist=(
diff --git a/distro/trisquel/64/mini/isoinfo b/distro/trisquel/64/mini/isoinfo
index c330000..fbbefc6 100644
--- a/distro/trisquel/64/mini/isoinfo
+++ b/distro/trisquel/64/mini/isoinfo
@@ -1,3 +1,4 @@
+ISONAME="$DISTRONAME mini amd64"
 ISOURL=trisquel-mini_7.0_amd64.iso
 MD5=baf8129a2bf08d6c9c3598a149399165
 
diff --git a/distro/trisquel/distroinfo b/distro/trisquel/distroinfo
new file mode 100644
index 0000000..53514c4
--- /dev/null
+++ b/distro/trisquel/distroinfo
@@ -0,0 +1,2 @@
+DISTRONAME='Trisquel GNU/Linux-libre'
+KEYWORD='trisquel'
diff --git a/distro/ubuntu/distroinfo b/distro/ubuntu/distroinfo
new file mode 100644
index 0000000..2bbed70
--- /dev/null
+++ b/distro/ubuntu/distroinfo
@@ -0,0 +1,2 @@
+DISTRONAME='Ubuntu'
+KEYWORD='ubuntu'
diff --git a/distro/ubuntu/isoinfo b/distro/ubuntu/isoinfo
index d1ce207..7b0a104 100644
--- a/distro/ubuntu/isoinfo
+++ b/distro/ubuntu/isoinfo
@@ -1,4 +1,6 @@
-ISOURL=16.04.1/ubuntu-16.04.1-desktop-amd64.iso
+_isover=16.04.1
+ISONAME="$DISTRONAME $_isover amd64"
+ISOURL=_isover/ubuntu-_isover-desktop-amd64.iso
 MD5=17643c29e3c4609818f26becf76d29a3
 
 mirrorlist=(