mirror of
https://github.com/oSoWoSo/DistroHopper.git
synced 2024-08-14 22:46:53 +00:00
Merge branch 'void' into mud-plus-void
This commit is contained in:
commit
daa730a2d9
2 changed files with 65 additions and 6 deletions
58
quickget
58
quickget
|
@ -76,6 +76,7 @@ function pretty_name() {
|
|||
ubuntu-kylin) PRETTY_NAME="Ubuntu Kylin";;
|
||||
ubuntu-mate) PRETTY_NAME="Ubuntu MATE";;
|
||||
ubuntu-studio) PRETTY_NAME="Ubuntu Studio";;
|
||||
void) PRETTY_NAME="Void Linux";;
|
||||
zorin) PRETTY_NAME="Zorin OS";;
|
||||
*) PRETTY_NAME="${SIMPLE_NAME^}";;
|
||||
esac
|
||||
|
@ -234,6 +235,7 @@ function os_support() {
|
|||
ubuntu-kylin \
|
||||
ubuntu-mate \
|
||||
ubuntu-studio \
|
||||
void \
|
||||
windows \
|
||||
xubuntu \
|
||||
zorin
|
||||
|
@ -442,6 +444,13 @@ function releases_ubuntu() {
|
|||
canary
|
||||
}
|
||||
|
||||
function releases_void() {
|
||||
echo base \
|
||||
musl \
|
||||
xfce \
|
||||
xfce-musl
|
||||
}
|
||||
|
||||
function languages_windows() {
|
||||
LANGS=(Arabic
|
||||
"Brazilian Portuguese"
|
||||
|
@ -687,6 +696,9 @@ function make_vm_config() {
|
|||
elif [[ "${OS}" == *"ubuntu"* ]]; then
|
||||
GUEST="linux"
|
||||
IMAGE_TYPE="iso"
|
||||
elif [ "${OS}" == "void" ]; then
|
||||
GUEST="linux"
|
||||
IMAGE_TYPE="iso"
|
||||
elif [ "${OS}" == "macos" ]; then
|
||||
GUEST="macos"
|
||||
IMAGE_TYPE="img"
|
||||
|
@ -751,6 +763,10 @@ EOF
|
|||
echo "disk_size=\"20G\"" >> "${OS}-${RELEASE}.conf"
|
||||
fi
|
||||
|
||||
if [ "${OS}" == "void" ]; then
|
||||
echo "disk_size=\"20G\"" >> "${OS}-${RELEASE}.conf"
|
||||
fi
|
||||
|
||||
if [ "${OS}" == "zorin" ]; then
|
||||
case ${RELEASE} in
|
||||
15education64|15edulite64|15edulite32)
|
||||
|
@ -1070,6 +1086,7 @@ function get_linuxmint() {
|
|||
web_get "${URL}" "${VM_PATH}"
|
||||
check_hash "${ISO}" "${HASH}"
|
||||
make_vm_config "${ISO}"
|
||||
|
||||
}
|
||||
|
||||
function get_manjaro() {
|
||||
|
@ -1151,6 +1168,7 @@ function get_nixos() {
|
|||
web_get "${URL}" "${VM_PATH}"
|
||||
check_hash "${ISO}" "${HASH}"
|
||||
make_vm_config "${ISO}"
|
||||
|
||||
}
|
||||
function get_openbsd() {
|
||||
local HASH=""
|
||||
|
@ -1166,6 +1184,40 @@ function get_openbsd() {
|
|||
make_vm_config "${ISO}"
|
||||
}
|
||||
|
||||
function get_void() {
|
||||
local HASH=""
|
||||
local ISO=""
|
||||
local URL=""
|
||||
local HASH_URL=""
|
||||
|
||||
validate_release "releases_void"
|
||||
DATE=$(wget -q -O- "https://mirror.fit.cvut.cz/voidlinux/live/current/sha256sum.txt" | awk 'NR == 1' |cut -d'.' -f1| cut -d'-' -f4)
|
||||
URL="http://mirror.fit.cvut.cz/voidlinux/live/current"
|
||||
case ${RELEASE} in
|
||||
base)
|
||||
ISO="void-live-x86_64-${DATE}.iso";;
|
||||
musl)
|
||||
ISO="void-live-x86_64-musl-${DATE}.iso";;
|
||||
xfce)
|
||||
ISO="void-live-x86_64-${DATE}-xfce.iso";;
|
||||
xfce-musl)
|
||||
ISO="void-live-x86_64-musl-${DATE}-xfce.iso";;
|
||||
esac
|
||||
case ${RELEASE} in
|
||||
base)
|
||||
HASH="$(wget -q -O- "https://mirror.fit.cvut.cz/voidlinux/live/current/sha256sum.txt" | grep "void-live-x86_64-${DATE}.iso" | cut -d' ' -f4)";;
|
||||
musl)
|
||||
HASH="$(wget -q -O- "https://mirror.fit.cvut.cz/voidlinux/live/current/sha256sum.txt" | grep "void-live-x86_64-musl-${DATE}.iso" | cut -d' ' -f4)";;
|
||||
xfce)
|
||||
HASH="$(wget -q -O- "https://mirror.fit.cvut.cz/voidlinux/live/current/sha256sum.txt" | grep "void-live-x86_64-${DATE}-xfce.iso" | cut -d' ' -f4)";;
|
||||
xfce-musl)
|
||||
HASH="$(wget -q -O- "https://mirror.fit.cvut.cz/voidlinux/live/current/sha256sum.txt" | grep "void-live-x86_64-musl-${DATE}.iso" | cut -d' ' -f4)";;
|
||||
esac
|
||||
web_get "${URL}/${ISO}" "${VM_PATH}"
|
||||
check_hash "${ISO}" "${HASH}"
|
||||
make_vm_config "${ISO}"
|
||||
}
|
||||
|
||||
function get_zorin() {
|
||||
local ISO=""
|
||||
local URL=""
|
||||
|
@ -1459,6 +1511,7 @@ function get_ubuntu() {
|
|||
make_vm_config "${ISO}"
|
||||
fi
|
||||
}
|
||||
|
||||
function get_garuda() {
|
||||
local HASH=""
|
||||
local ISO=""
|
||||
|
@ -1805,7 +1858,6 @@ function unattended_windows() {
|
|||
EOF
|
||||
}
|
||||
|
||||
|
||||
function dbg_windows() {
|
||||
local DEBUG=0
|
||||
if [ ${DEBUG} -eq 1 ]; then
|
||||
|
@ -1956,6 +2008,8 @@ if [ -n "${2}" ]; then
|
|||
get_archlinux
|
||||
elif [ "${OS}" == "arcolinux" ]; then
|
||||
get_arcolinux
|
||||
elif [ "${OS}" == "void" ]; then
|
||||
get_void
|
||||
elif [ "${OS}" == "debian" ]; then
|
||||
if [ -n "${3}" ]; then
|
||||
FREEDOM="${3}"
|
||||
|
@ -2129,6 +2183,8 @@ else
|
|||
releases_tails
|
||||
elif [[ "${OS}" == *"ubuntu"* ]]; then
|
||||
releases_ubuntu
|
||||
elif [ "${OS}" == "void" ]; then
|
||||
releases_void
|
||||
elif [ "${OS}" == "windows" ]; then
|
||||
releases_windows
|
||||
elif [ "${OS}" == "zorin" ]; then
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue