AIR/quickemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merged 577

Browse Source 
fixed conflicts and readme


Co-authored-by: funk-on-code  <funk-on-code@users.noreply.github.com>
This commit is contained in:
Phil Clifford 2023-04-30 01:53:36 +01:00
parent 7a87d5ac7e
commit 2a8bc711c4
No known key found for this signature in database
GPG Key ID: 3B0A3BA167A07F7D
1 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
quickget
View File

@ -70,6 +70,7 @@ function pretty_name() {
ubuntucinnamon) PRETTY_NAME="Ubuntu Cinnamon";; ubuntucinnamon) PRETTY_NAME="Ubuntu Cinnamon";;
ubuntukylin) PRETTY_NAME="Ubuntu Kylin";; ubuntukylin) PRETTY_NAME="Ubuntu Kylin";;
ubuntu-mate) PRETTY_NAME="Ubuntu MATE";; ubuntu-mate) PRETTY_NAME="Ubuntu MATE";;
ubuntuserver) PRETTY_NAME="Ubuntu Server";;
ubuntustudio) PRETTY_NAME="Ubuntu Studio";; ubuntustudio) PRETTY_NAME="Ubuntu Studio";;
ubuntu-unity) PRETTY_NAME="Ubuntu Unity";; ubuntu-unity) PRETTY_NAME="Ubuntu Unity";;
void) PRETTY_NAME="Void Linux";; void) PRETTY_NAME="Void Linux";;
@ -87,6 +88,7 @@ function validate_release() {
DISPLAY_NAME="$(pretty_name "${OS}")" DISPLAY_NAME="$(pretty_name "${OS}")"
case ${OS} in case ${OS} in
*ubuntuserver*) RELEASE_GENERATOR="releases_ubuntuserver";;
*ubuntu*) RELEASE_GENERATOR="releases_ubuntu";; *ubuntu*) RELEASE_GENERATOR="releases_ubuntu";;
*) RELEASE_GENERATOR="${1}";; *) RELEASE_GENERATOR="${1}";;
esac esac
@ -224,6 +226,7 @@ function os_support() {
ubuntucinnamon \ ubuntucinnamon \
ubuntukylin \ ubuntukylin \
ubuntu-mate \ ubuntu-mate \
ubuntuserver \
ubuntustudio \ ubuntustudio \
ubuntu-unity \ ubuntu-unity \
void \ void \
@ -429,6 +432,7 @@ function editions_linuxmint(){
function editions_lmde(){ function editions_lmde(){
echo cinnamon echo cinnamon
} }
function releases_lmde(){ function releases_lmde(){
echo 5 echo 5
} }
@ -638,6 +642,10 @@ function releases_ubuntu() {
fi fi
} }
function releases_ubuntuserver() {
echo 20.04 20.04.5 22.04 22.04.1
}
function releases_void() { function releases_void() {
echo current echo current
} }
@ -900,6 +908,15 @@ EOF
# echo "1stdrive_size=\"20G\"" >> "${CONF_FILE}" # for testing # echo "1stdrive_size=\"20G\"" >> "${CONF_FILE}" # for testing
# echo "2nddrive_size=\"20G\"" >> "${CONF_FILE}" # again, for testing # echo "2nddrive_size=\"20G\"" >> "${CONF_FILE}" # again, for testing
;; ;;
ubuntuserver)
# 22.04+ fails on LVM build if disk size is < 10G
# 22.04.1 fails on auto-install if TPM is disabled
echo "disk_size=\"10G\"" >> "${CONF_FILE}"
echo "ram=\"4G\"" >> "${CONF_FILE}"
if [[ "${RELEASE}" == *"22.04"* ]]; then
echo "tpm=\"on\"" >> "${CONF_FILE}"
fi
;;
zorin) zorin)
case ${EDITION} in case ${EDITION} in
education64|edulite64) education64|edulite64)
@ -1627,6 +1644,20 @@ function get_truenas-core() {
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=""
@ -1662,7 +1693,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
#echo "${URL}/${ISO} ${HASH}"
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"
@ -2231,6 +2261,11 @@ if [ -n "${2}" ]; then
# macOS doesn't use create_vm() # macOS doesn't use create_vm()
validate_release releases_macos validate_release releases_macos
get_macos get_macos
elif [[ "${OS}" == *"ubuntuserver"* ]]; then
# (Comes before regular Ubuntu, or the code tries to download the desktop) #
# Ubuntu doesn't use create_vm()
validate_release releases_ubuntuserver
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
@ -2261,6 +2296,10 @@ 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
*ubuntuserver*)
echo -n " - Releases: "
releases_ubuntuserver | sed -Ee 's/eol-\S+//g' # hide eol releases
;;
*ubuntu*) *ubuntu*)
echo -n " - Releases: " echo -n " - Releases: "
releases_ubuntu | sed -Ee 's/eol-\S+//g' # hide eol releases releases_ubuntu | sed -Ee 's/eol-\S+//g' # hide eol releases