So, adding it like a regular release works!
This commit is contained in:
parent
aa08a0f119
commit
549038b449
45
quickget
45
quickget
@ -62,7 +62,7 @@ function pretty_name() {
|
|||||||
ubuntu-budgie) PRETTY_NAME="Ubuntu Budgie";;
|
ubuntu-budgie) PRETTY_NAME="Ubuntu Budgie";;
|
||||||
ubuntukylin) PRETTY_NAME="Ubuntu Kylin";;
|
ubuntukylin) PRETTY_NAME="Ubuntu Kylin";;
|
||||||
ubuntu-mate) PRETTY_NAME="Ubuntu MATE";;
|
ubuntu-mate) PRETTY_NAME="Ubuntu MATE";;
|
||||||
ubuntu-server) PRETTY_NAME="Ubuntu Server";;
|
ubuntuserver) PRETTY_NAME="Ubuntu Server";;
|
||||||
ubuntustudio) PRETTY_NAME="Ubuntu Studio";;
|
ubuntustudio) PRETTY_NAME="Ubuntu Studio";;
|
||||||
void) PRETTY_NAME="Void Linux";;
|
void) PRETTY_NAME="Void Linux";;
|
||||||
zorin) PRETTY_NAME="Zorin OS";;
|
zorin) PRETTY_NAME="Zorin OS";;
|
||||||
@ -78,7 +78,7 @@ function validate_release() {
|
|||||||
|
|
||||||
DISPLAY_NAME="$(pretty_name "${OS}")"
|
DISPLAY_NAME="$(pretty_name "${OS}")"
|
||||||
case ${OS} in
|
case ${OS} in
|
||||||
ubuntu-server) RELEASE_GENERATOR="releases_ubuntuserver";;
|
*ubuntuserver*) RELEASE_GENERATOR="releases_ubuntuserver";;
|
||||||
*ubuntu*) RELEASE_GENERATOR="releases_ubuntu";;
|
*ubuntu*) RELEASE_GENERATOR="releases_ubuntu";;
|
||||||
*) RELEASE_GENERATOR="${1}";;
|
*) RELEASE_GENERATOR="${1}";;
|
||||||
esac
|
esac
|
||||||
@ -207,7 +207,7 @@ function os_support() {
|
|||||||
ubuntu-budgie \
|
ubuntu-budgie \
|
||||||
ubuntukylin \
|
ubuntukylin \
|
||||||
ubuntu-mate \
|
ubuntu-mate \
|
||||||
ubuntu-server \
|
ubuntuserver \
|
||||||
ubuntustudio \
|
ubuntustudio \
|
||||||
void \
|
void \
|
||||||
windows \
|
windows \
|
||||||
@ -381,6 +381,7 @@ function editions_linuxmint(){
|
|||||||
function editions_lmde(){
|
function editions_lmde(){
|
||||||
echo cinnamon
|
echo cinnamon
|
||||||
}
|
}
|
||||||
|
|
||||||
function releases_lmde(){
|
function releases_lmde(){
|
||||||
echo 5
|
echo 5
|
||||||
}
|
}
|
||||||
@ -473,10 +474,6 @@ function releases_tails() {
|
|||||||
echo stable
|
echo stable
|
||||||
}
|
}
|
||||||
|
|
||||||
function releases_ubuntuserver() {
|
|
||||||
echo live-server-20.04 live-server-22.04
|
|
||||||
}
|
|
||||||
|
|
||||||
function releases_ubuntu() {
|
function releases_ubuntu() {
|
||||||
local LTS_SUPPORT="14.04 16.04 18.04 20.04 22.04"
|
local LTS_SUPPORT="14.04 16.04 18.04 20.04 22.04"
|
||||||
case "${OS}" in
|
case "${OS}" in
|
||||||
@ -532,6 +529,10 @@ function releases_ubuntu() {
|
|||||||
;
|
;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function releases_ubuntuserver() {
|
||||||
|
echo 20.04 20.04.5 22.04 22.04.1
|
||||||
|
}
|
||||||
|
|
||||||
function releases_void() {
|
function releases_void() {
|
||||||
echo current
|
echo current
|
||||||
}
|
}
|
||||||
@ -1413,6 +1414,20 @@ function get_tails() {
|
|||||||
echo "${URL} ${HASH}"
|
echo "${URL} ${HASH}"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function get_ubuntuserver() {
|
||||||
|
local EDITION="${1:-}"
|
||||||
|
local HASH=""
|
||||||
|
local ISO="ubuntu-${RELEASE}-live-server-amd64.iso"
|
||||||
|
local URL="https://releases.ubuntu.com/${RELEASE}"
|
||||||
|
|
||||||
|
HASH=$(wget -q -O- "${URL}/SHA256SUMS" | grep "${ISO}" | cut -d' ' -f1)
|
||||||
|
echo "${URL}/${ISO} ${HASH}"
|
||||||
|
|
||||||
|
web_get "${URL}/${ISO}" "${VM_PATH}"
|
||||||
|
check_hash "${ISO}" "${HASH}"
|
||||||
|
make_vm_config "${ISO}"
|
||||||
|
}
|
||||||
|
|
||||||
function get_ubuntu() {
|
function get_ubuntu() {
|
||||||
local ISO=""
|
local ISO=""
|
||||||
local HASH=""
|
local HASH=""
|
||||||
@ -1441,16 +1456,6 @@ function get_ubuntu() {
|
|||||||
URL="https://cdimage.ubuntu.com/${OS}/releases/${RELEASE}/release"
|
URL="https://cdimage.ubuntu.com/${OS}/releases/${RELEASE}/release"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
if [ "${RELEASE}" == "ubuntu-server" ]; then
|
|
||||||
if wget -q --spider "${URL}/SHA256SUMS"; then
|
|
||||||
ISO=$(wget -q -O- "${URL}/SHA256SUMS" | grep 'live-server\|install' | grep amd64 | grep iso | cut -d'*' -f2)
|
|
||||||
HASH=$(wget -q -O- "${URL}/SHA256SUMS" | grep 'live-server\|install' | grep amd64 | grep iso |cut -d' ' -f1)
|
|
||||||
else
|
|
||||||
ISO=$(wget -q -O- "${URL}/MD5SUMS" | grep 'live-server\|install' | grep amd64 | grep iso | cut -d' ' -f3)
|
|
||||||
HASH=$(wget -q -O- "${URL}/MD5SUMS" | grep 'live-server|install' | grep amd64 | grep iso | cut -d' ' -f1)
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
if wget -q --spider "${URL}/SHA256SUMS"; then
|
if wget -q --spider "${URL}/SHA256SUMS"; then
|
||||||
ISO=$(wget -q -O- "${URL}/SHA256SUMS" | grep 'desktop\|dvd\|install' | grep amd64 | grep iso | cut -d'*' -f2)
|
ISO=$(wget -q -O- "${URL}/SHA256SUMS" | grep 'desktop\|dvd\|install' | grep amd64 | grep iso | cut -d'*' -f2)
|
||||||
HASH=$(wget -q -O- "${URL}/SHA256SUMS" | grep 'desktop\|dvd\|install' | grep amd64 | grep iso |cut -d' ' -f1)
|
HASH=$(wget -q -O- "${URL}/SHA256SUMS" | grep 'desktop\|dvd\|install' | grep amd64 | grep iso |cut -d' ' -f1)
|
||||||
@ -1458,7 +1463,6 @@ function get_ubuntu() {
|
|||||||
ISO=$(wget -q -O- "${URL}/MD5SUMS" | grep 'desktop\|dvd\|install' | grep amd64 | grep iso | cut -d' ' -f3)
|
ISO=$(wget -q -O- "${URL}/MD5SUMS" | grep 'desktop\|dvd\|install' | grep amd64 | grep iso | cut -d' ' -f3)
|
||||||
HASH=$(wget -q -O- "${URL}/MD5SUMS" | grep 'desktop\|dvd\|install' | grep amd64 | grep iso | cut -d' ' -f1)
|
HASH=$(wget -q -O- "${URL}/MD5SUMS" | grep 'desktop\|dvd\|install' | grep amd64 | grep iso | cut -d' ' -f1)
|
||||||
fi
|
fi
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ "${RELEASE}" == *"daily"* ]] || [ "${RELEASE}" == "dvd" ]; then
|
if [[ "${RELEASE}" == *"daily"* ]] || [ "${RELEASE}" == "dvd" ]; then
|
||||||
zsync_get "${URL}/${ISO}" "${VM_PATH}" "${OS}-devel.iso"
|
zsync_get "${URL}/${ISO}" "${VM_PATH}" "${OS}-devel.iso"
|
||||||
@ -1983,9 +1987,10 @@ if [ -n "${2}" ]; then
|
|||||||
validate_release releases_macos
|
validate_release releases_macos
|
||||||
get_macos
|
get_macos
|
||||||
elif [[ "${OS}" == *"ubuntuserver"* ]]; then
|
elif [[ "${OS}" == *"ubuntuserver"* ]]; then
|
||||||
|
# (Comes before regular Ubuntu, or the code tries to download the desktop) #
|
||||||
# Ubuntu doesn't use create_vm()
|
# Ubuntu doesn't use create_vm()
|
||||||
validate_release releases_ubuntuserver
|
validate_release releases_ubuntuserver
|
||||||
get_ubuntu
|
get_ubuntuserver
|
||||||
elif [[ "${OS}" == *"ubuntu"* ]]; then
|
elif [[ "${OS}" == *"ubuntu"* ]]; then
|
||||||
# Ubuntu doesn't use create_vm()
|
# Ubuntu doesn't use create_vm()
|
||||||
validate_release releases_ubuntu
|
validate_release releases_ubuntu
|
||||||
@ -2016,7 +2021,7 @@ if [ -n "${2}" ]; then
|
|||||||
else
|
else
|
||||||
echo "ERROR! You must specify a release."
|
echo "ERROR! You must specify a release."
|
||||||
case ${OS} in
|
case ${OS} in
|
||||||
*ubuntu-server*)
|
*ubuntuserver*)
|
||||||
echo -n " - Releases: "
|
echo -n " - Releases: "
|
||||||
releases_ubuntuserver | sed -Ee 's/eol-\S+//g' # hide eol releases
|
releases_ubuntuserver | sed -Ee 's/eol-\S+//g' # hide eol releases
|
||||||
;;
|
;;
|
||||||
|
Loading…
Reference in New Issue
Block a user