From 1850f3ddf6f8f07cd29941e8b20795a5ed69b860 Mon Sep 17 00:00:00 2001 From: Iru Cai Date: Thu, 6 Dec 2018 15:49:42 +0800 Subject: distro/debian: update to 9.6.0 --- distro/debian/64/cinnamon/entry | 7 ++----- distro/debian/64/cinnamon/isoinfo | 4 +--- distro/debian/64/entry | 5 +++++ distro/debian/64/gnome/entry | 7 ++----- distro/debian/64/gnome/isoinfo | 4 +--- distro/debian/64/kde/entry | 7 ++----- distro/debian/64/kde/isoinfo | 4 +--- distro/debian/64/lxde/entry | 7 ++----- distro/debian/64/lxde/isoinfo | 4 +--- distro/debian/64/mate/entry | 7 ++----- distro/debian/64/mate/isoinfo | 4 +--- distro/debian/64/standard/entry | 5 ----- distro/debian/64/standard/install.sh | 2 -- distro/debian/64/standard/isoinfo | 4 ---- distro/debian/64/xfce/entry | 7 ++----- distro/debian/64/xfce/isoinfo | 4 +--- distro/debian/SHA512SUMS | 6 ++++++ distro/debian/isoinfo.common | 17 ++++++++++++++++- 18 files changed, 45 insertions(+), 60 deletions(-) create mode 100644 distro/debian/64/entry delete mode 100644 distro/debian/64/standard/entry delete mode 100644 distro/debian/64/standard/install.sh delete mode 100644 distro/debian/64/standard/isoinfo create mode 100644 distro/debian/SHA512SUMS 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/entry b/distro/debian/64/entry new file mode 100644 index 0000000..8063d1f --- /dev/null +++ b/distro/debian/64/entry @@ -0,0 +1,5 @@ +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" +X64=y 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/entry b/distro/debian/64/standard/entry deleted file mode 100644 index a6447a6..0000000 --- a/distro/debian/64/standard/entry +++ /dev/null @@ -1,5 +0,0 @@ -TITLE='Debian 8.5.0 AMD64 standard' -KERNEL=/liveusb-kernel/debian/64/vmlinuz -INITRD=/liveusb-kernel/debian/64/initrd.img -OPTION="boot=live findiso=liveusb-data/debian/$ISOFILE" -X64=y 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 diff --git a/distro/debian/SHA512SUMS b/distro/debian/SHA512SUMS new file mode 100644 index 0000000..727276a --- /dev/null +++ b/distro/debian/SHA512SUMS @@ -0,0 +1,6 @@ +f2517b803932cb5202c51e738712565642509e0ec2c35de296716793ae84fc65af4b7a469a64774d0ddf317d309c85cb76ac46d150b071a344cad48ff9c8a544 debian-live-9.6.0-amd64-cinnamon.iso +84661977a0d91cc37a4462d4cb8a67a21b78b5aab50259d6e29176d4663e751e976b9b3156da2a2c83c609f47611a3636e299cf903a992f17220fa0af71cbfa1 debian-live-9.6.0-amd64-gnome.iso +c6d316d727d34c44225ec90962634fd61c483d7e2c346a4fa25e1b76fac8ead13ac1a2cf665261afa474b5453d240f1b87266433abfeb439880cff885e8e9103 debian-live-9.6.0-amd64-kde.iso +27d7556eedda3ffbc5bd7f18b6665bf7ae38a5fb6e2a66cba49abd4ed704d23bf828c82953cd9c9a95c36b304c55bda186b1bd4acaa837dcc4b1fe411f4494fd debian-live-9.6.0-amd64-lxde.iso +75a642fcf914f46d6ad123152993eaf5e4dce17dba21426d04d89b7b0c4d9afc755955b11188e08f0e23a74c25d00235d5f226f525526a22ff4fba9e5ba01816 debian-live-9.6.0-amd64-mate.iso +e35dd65fe1b078f71fcf04fa749a05bfefe4aa11a9e80f116ceec0566d65636a4ac84a9aff22aa3f7a8eeb10289d0c2f54dfe7c599d8aa16663e4f9a74f3eec5 debian-live-9.6.0-amd64-xfce.iso diff --git a/distro/debian/isoinfo.common b/distro/debian/isoinfo.common index 9ca156e..44da88b 100644 --- a/distro/debian/isoinfo.common +++ b/distro/debian/isoinfo.common @@ -1,6 +1,21 @@ -_isover=8.6.0 +_isover=9.6.0 +ISONAME="$DISTRONAME $_isover amd64 ${_desktop}" +ISOURL="${_isover}-live/amd64/iso-hybrid/debian-live-${_isover}-amd64-${_desktop,,}.iso" +VERIFY=sha512chk mirrorlist=( https://mirrors.tuna.tsinghua.edu.cn/debian-cd http://mirrors.ustc.edu.cn/debian-cd ) + +sha512chk() { + local _cksum _hashsum + _cksum=$(sha512sum "$ISOPATH/$ISOFILE" | cut -d' ' -f1) + _hashsum=$(grep "${ISOFILE}\$" distro/debian/SHA512SUMS | cut -d' ' -f1) + + if [[ $_cksum == $_hashsum ]]; then + msg "$ISOFILE ok." + else + msg "$ISOFILE checksum bad!" && return 1 + fi +} -- cgit v1.2.3