15 files changed, 19 insertions, 55 deletions

diff --git a/distro/debian/64/cinnamon/entry b/distro/debian/64/cinnamon/entry
index 654a555..20b9a64 100644
--- a/distro/debian/64/cinnamon/entry
+++ b/distro/debian/64/cinnamon/entry
@@ -1,5 +1,2 @@
-TITLE='Debian 8.5.0 AMD64 Cinnamon'
-KERNEL=/liveusb-kernel/debian/64/vmlinuz
-INITRD=/liveusb-kernel/debian/64/initrd.img
-OPTION="boot=live findiso=liveusb-data/debian/$ISOFILE"
-X64=y
+_desktop=Cinnamon
+source distro/debian/64/entry
diff --git a/distro/debian/64/cinnamon/isoinfo b/distro/debian/64/cinnamon/isoinfo
index e8cd35b..4968327 100644
--- a/distro/debian/64/cinnamon/isoinfo
+++ b/distro/debian/64/cinnamon/isoinfo
@@ -1,4 +1,2 @@
+_desktop=Cinnamon
 source distro/debian/isoinfo.common
-ISONAME="$DISTRONAME $_isover amd64 Cinnamon"
-ISOURL="${_isover}-live/amd64/iso-hybrid/debian-live-${_isover}-amd64-cinnamon-desktop.iso"
-SHA1=6fa1ca66f4ab315802ce29b772437ce4f38b45af
diff --git a/distro/debian/64/standard/entry b/distro/debian/64/entry
index a6447a6..8063d1f 100644
--- a/distro/debian/64/standard/entry
+++ b/distro/debian/64/entry
@@ -1,4 +1,4 @@
-TITLE='Debian 8.5.0 AMD64 standard'
+TITLE="Debian 9.6.0 AMD64 ${_desktop}"
 KERNEL=/liveusb-kernel/debian/64/vmlinuz
 INITRD=/liveusb-kernel/debian/64/initrd.img
 OPTION="boot=live findiso=liveusb-data/debian/$ISOFILE"
diff --git a/distro/debian/64/gnome/entry b/distro/debian/64/gnome/entry
index 616ccb5..4970152 100644
--- a/distro/debian/64/gnome/entry
+++ b/distro/debian/64/gnome/entry
@@ -1,5 +1,2 @@
-TITLE='Debian 8.5.0 AMD64 GNOME'
-KERNEL=/liveusb-kernel/debian/64/vmlinuz
-INITRD=/liveusb-kernel/debian/64/initrd.img
-OPTION="boot=live findiso=liveusb-data/debian/$ISOFILE"
-X64=y
+_desktop=GNOME
+source distro/debian/64/entry
diff --git a/distro/debian/64/gnome/isoinfo b/distro/debian/64/gnome/isoinfo
index 7a60de5..3ff5a3e 100644
--- a/distro/debian/64/gnome/isoinfo
+++ b/distro/debian/64/gnome/isoinfo
@@ -1,4 +1,2 @@
+_desktop=GNOME
 source distro/debian/isoinfo.common
-ISONAME="$DISTRONAME $_isover amd64 GNOME"
-ISOURL="${_isover}-live/amd64/iso-hybrid/debian-live-${_isover}-amd64-gnome-desktop.iso"
-SHA1=3501cb9927f2c5c96aefe98a62957d9db138d2c9
diff --git a/distro/debian/64/kde/entry b/distro/debian/64/kde/entry
index 0bdb29b..f29197c 100644
--- a/distro/debian/64/kde/entry
+++ b/distro/debian/64/kde/entry
@@ -1,5 +1,2 @@
-TITLE='Debian 8.5.0 AMD64 KDE'
-KERNEL=/liveusb-kernel/debian/64/vmlinuz
-INITRD=/liveusb-kernel/debian/64/initrd.img
-OPTION="boot=live findiso=liveusb-data/debian/$ISOFILE"
-X64=y
+_desktop=KDE
+source distro/debian/64/entry
diff --git a/distro/debian/64/kde/isoinfo b/distro/debian/64/kde/isoinfo
index 9c7c837..a0713be 100644
--- a/distro/debian/64/kde/isoinfo
+++ b/distro/debian/64/kde/isoinfo
@@ -1,4 +1,2 @@
+_desktop=KDE
 source distro/debian/isoinfo.common
-ISONAME="$DISTRONAME $_isover amd64 KDE"
-ISOURL="${_isover}-live/amd64/iso-hybrid/debian-live-${_isover}-amd64-kde-desktop.iso"
-SHA1=91283353d48e785f242ec82df48fa245eca99f14
diff --git a/distro/debian/64/lxde/entry b/distro/debian/64/lxde/entry
index 9f02223..27eb300 100644
--- a/distro/debian/64/lxde/entry
+++ b/distro/debian/64/lxde/entry
@@ -1,5 +1,2 @@
-TITLE='Debian 8.5.0 AMD64 LXDE'
-KERNEL=/liveusb-kernel/debian/64/vmlinuz
-INITRD=/liveusb-kernel/debian/64/initrd.img
-OPTION="boot=live findiso=liveusb-data/debian/$ISOFILE"
-X64=y
+_desktop=LXDE
+source distro/debian/64/entry
diff --git a/distro/debian/64/lxde/isoinfo b/distro/debian/64/lxde/isoinfo
index 537f16d..77fc955 100644
--- a/distro/debian/64/lxde/isoinfo
+++ b/distro/debian/64/lxde/isoinfo
@@ -1,4 +1,2 @@
+_desktop=LXDE
 source distro/debian/isoinfo.common
-ISONAME="$DISTRONAME $_isover amd64 LXDE"
-ISOURL="${_isover}-live/amd64/iso-hybrid/debian-live-${_isover}-amd64-lxde-desktop.iso"
-SHA1=68176812d64a9d0359a4c1965bcdc6bd0a9faeae
diff --git a/distro/debian/64/mate/entry b/distro/debian/64/mate/entry
index 3ed649b..7a34cfb 100644
--- a/distro/debian/64/mate/entry
+++ b/distro/debian/64/mate/entry
@@ -1,5 +1,2 @@
-TITLE='Debian 8.5.0 AMD64 MATE'
-KERNEL=/liveusb-kernel/debian/64/vmlinuz
-INITRD=/liveusb-kernel/debian/64/initrd.img
-OPTION="boot=live findiso=liveusb-data/debian/$ISOFILE"
-X64=y
+_desktop=MATE
+source distro/debian/64/entry
diff --git a/distro/debian/64/mate/isoinfo b/distro/debian/64/mate/isoinfo
index 4c56120..e9bc172 100644
--- a/distro/debian/64/mate/isoinfo
+++ b/distro/debian/64/mate/isoinfo
@@ -1,4 +1,2 @@
+_desktop=MATE
 source distro/debian/isoinfo.common
-ISONAME="$DISTRONAME $_isover amd64 MATE"
-ISOURL="${_isover}-live/amd64/iso-hybrid/debian-live-${_isover}-amd64-mate-desktop.iso"
-SHA1=03ad9cadba4047856cfd6ebf640502036c3bc124
diff --git a/distro/debian/64/standard/install.sh b/distro/debian/64/standard/install.sh
deleted file mode 100644
index ef2c585..0000000
--- a/distro/debian/64/standard/install.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-source distro/debian/64/install.sh
-
diff --git a/distro/debian/64/standard/isoinfo b/distro/debian/64/standard/isoinfo
deleted file mode 100644
index 99fd760..0000000
--- a/distro/debian/64/standard/isoinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-source distro/debian/isoinfo.common
-ISONAME="$DISTRONAME $_isover amd64 standard"
-ISOURL="${_isover}-live/amd64/iso-hybrid/debian-live-${_isover}-amd64-standard-desktop.iso"
-SHA1=46938b90a2b32f4f765e0c0ff2d61200b111a715
diff --git a/distro/debian/64/xfce/entry b/distro/debian/64/xfce/entry
index 5dacce9..4d1178e 100644
--- a/distro/debian/64/xfce/entry
+++ b/distro/debian/64/xfce/entry
@@ -1,5 +1,2 @@
-TITLE='Debian 8.5.0 AMD64 Xfce'
-KERNEL=/liveusb-kernel/debian/64/vmlinuz
-INITRD=/liveusb-kernel/debian/64/initrd.img
-OPTION="boot=live findiso=liveusb-data/debian/$ISOFILE"
-X64=y
+_desktop=Xfce
+source distro/debian/64/entry
diff --git a/distro/debian/64/xfce/isoinfo b/distro/debian/64/xfce/isoinfo
index 1f5d830..3c65a22 100644
--- a/distro/debian/64/xfce/isoinfo
+++ b/distro/debian/64/xfce/isoinfo
@@ -1,4 +1,2 @@
+_desktop=Xfce
 source distro/debian/isoinfo.common
-ISONAME="$DISTRONAME $_isover amd64 Xfce"
-ISOURL="${_isover}-live/amd64/iso-hybrid/debian-live-${_isover}-amd64-xfce-desktop.iso"
-SHA1=916513594b86929b14ddbd5982d667b722c0c273