Merge branch 'quickemu-project:master' into submod-docbuild

This commit is contained in:
Phil Clifford 2022-02-24 00:27:37 +00:00 committed by GitHub
commit bb460928b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 58 additions and 5 deletions

20
.editorconfig Normal file
View File

@ -0,0 +1,20 @@
root = true
[quickemu]
charset = utf-8
end_of_line = lf
insert_final_newline = true
indent_style = space
indent_size = 2
trim_trailing_whitespace = true
[quickget]
charset = utf-8
end_of_line = lf
insert_final_newline = true
indent_style = space
indent_size = 4
trim_trailing_whitespace = true
[*.md]
trim_trailing_whitespace = false

View File

@ -220,6 +220,7 @@ Other Operating Systems
- `cachyos` (CachyOS)
- `debian` (Debian)
- `devuan` (Devuan)
`dragonflybsd` (DragonFlyBSD)
- `elementary` (elementary OS)
- `fedora` (Fedora)
- `freebsd` (FreeBSD)

View File

@ -1300,3 +1300,5 @@ if [ ${SHORTCUT} -eq 1 ]; then
fi
vm_boot
# vim:tabstop=2:shiftwidth=2:expandtab

View File

@ -36,6 +36,7 @@ function pretty_name() {
archlinux) PRETTY_NAME="Arch Linux";;
arcolinux) PRETTY_NAME="Arco Linux";;
cachyos) PRETTY_NAME="CachyOS";;
dragonflybsd) PRETTY_NAME="DragonFlyBSD";;
elementary) PRETTY_NAME="elementary OS";;
freebsd) PRETTY_NAME="FreeBSD";;
garuda) PRETTY_NAME="Garuda Linux";;
@ -54,11 +55,10 @@ function pretty_name() {
popos) PRETTY_NAME="Pop!_OS";;
regolith) PRETTY_NAME="Regolith Linux";;
rockylinux) PRETTY_NAME="Rocky Linux";;
slackware) PRETTY_NAME="Slackware Linux";;
ubuntu-budgie) PRETTY_NAME="Ubuntu Budgie";;
ubuntu-kylin) PRETTY_NAME="Ubuntu Kylin";;
ubuntukylin) PRETTY_NAME="Ubuntu Kylin";;
ubuntu-mate) PRETTY_NAME="Ubuntu MATE";;
ubuntu-studio) PRETTY_NAME="Ubuntu Studio";;
ubuntustudio) PRETTY_NAME="Ubuntu Studio";;
void) PRETTY_NAME="Void Linux";;
zorin) PRETTY_NAME="Zorin OS";;
*) PRETTY_NAME="${SIMPLE_NAME^}";;
@ -162,6 +162,7 @@ function os_support() {
cachyos \
debian \
devuan \
dragonflybsd \
elementary \
fedora \
freebsd \
@ -242,13 +243,17 @@ function releases_debian() {
}
function editions_debian() {
echo standard cinnamon gnome kde lxde lxqt mate xfce
echo standard cinnamon gnome kde lxde lxqt mate xfce netinst
}
function releases_devuan() {
echo beowulf chimaera
}
function releases_dragonflybsd() {
echo 6.2.1
}
function releases_elementary() {
echo 6.1
}
@ -274,6 +279,10 @@ function releases_freebsd(){
echo 12.2 12.3 13.0
}
function editions_freebsd(){
echo disc1 dvd1
}
function releases_garuda() {
echo 220131
}
@ -597,6 +606,9 @@ function make_vm_config() {
IMAGE_FILE="${1}"
ISO_FILE="${2}"
case "${OS}" in
dragonflybsd)
GUEST="dragonflybsd"
IMAGE_TYPE="iso";;
freebsd|ghostbsd)
GUEST="freebsd"
IMAGE_TYPE="iso";;
@ -643,7 +655,7 @@ EOF
# OS specific tweaks
case ${OS} in
alma|oraclelinux|rockylinux) echo "disk_size=\"32G\"" >> "${CONF_FILE}";;
haiku|openbsd|netbsd|slackware|tails) echo "boot=\"legacy\"" >> "${CONF_FILE}";;
dragonflybsd|haiku|openbsd|netbsd|slackware|tails) echo "boot=\"legacy\"" >> "${CONF_FILE}";;
kolibrios)
echo "boot=\"legacy\"" >> "${CONF_FILE}"
echo "disk_size=\"2G\"" >> "${CONF_FILE}"
@ -753,6 +765,13 @@ function get_debian() {
11.2.0) URL="https://cdimage.debian.org/debian-cd/${RELEASE}-live/amd64/iso-hybrid";;
*) URL="https://cdimage.debian.org/cdimage/archive/${RELEASE}-live/amd64/iso-hybrid/";;
esac
if [ "${EDITION}" == "netinst" ]; then
URL="${URL/-live/}"
URL="${URL/hybrid/cd}"
ISO="${ISO/-live/}"
fi
HASH=$(wget -q -O- "${URL}/SHA512SUMS" | grep "${ISO}" | cut -d' ' -f1)
echo "${URL}/${ISO} ${HASH}"
}
@ -770,6 +789,15 @@ function get_devuan() {
echo "${URL}/${ISO} ${HASH}"
}
function get_dragonflybsd() {
local HASH=""
local ISO="dfly-x86_64-${RELEASE}_REL.iso"
local URL="http://mirror-master.dragonflybsd.org/iso-images"
HASH=$(wget -q -O- "${URL}/md5.txt" | grep "(${ISO})" | cut -d' ' -f4)
echo "${URL}/${ISO} ${HASH}"
}
function get_elementary() {
local HASH=""
local ISO="elementaryos-${RELEASE}-stable.20211218-rc.iso"
@ -1704,3 +1732,5 @@ else
esac
exit 1
fi
# vim:tabstop=4:shiftwidth=4:expandtab