Merge branch 'master' of https://github.com/wimpysworld/quickemu
This commit is contained in:
commit
4747eb0ed8
16
quickemu
16
quickemu
@ -1,8 +1,7 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
export LC_ALL=C
|
export LC_ALL=C
|
||||||
|
|
||||||
if ((BASH_VERSINFO[0] < 4))
|
if ((BASH_VERSINFO[0] < 4)); then
|
||||||
then
|
|
||||||
echo "Sorry, you need bash 4.0 or newer to run this script."
|
echo "Sorry, you need bash 4.0 or newer to run this script."
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
@ -992,8 +991,8 @@ function vm_boot() {
|
|||||||
-device tpm-tis,tpmdev=tpm0)
|
-device tpm-tis,tpmdev=tpm0)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -n "$extra_args" ]; then
|
if [ -n "${extra_args}" ]; then
|
||||||
args+=($extra_args)
|
args+=("${extra_args}")
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# The OSK parameter contains parenthesis, they need to be escaped in the shell
|
# The OSK parameter contains parenthesis, they need to be escaped in the shell
|
||||||
@ -1023,8 +1022,8 @@ function shortcut_create {
|
|||||||
local dirname="${HOME}/.local/share/applications"
|
local dirname="${HOME}/.local/share/applications"
|
||||||
local filename="${HOME}/.local/share/applications/${VMNAME}.desktop"
|
local filename="${HOME}/.local/share/applications/${VMNAME}.desktop"
|
||||||
|
|
||||||
if [ ! -d ${dirname} ]; then
|
if [ ! -d "${dirname}" ]; then
|
||||||
mkdir -p ${dirname}
|
mkdir -p "${dirname}"
|
||||||
fi
|
fi
|
||||||
cat << EOF > "${filename}"
|
cat << EOF > "${filename}"
|
||||||
[Desktop Entry]
|
[Desktop Entry]
|
||||||
@ -1078,6 +1077,7 @@ bridge=""
|
|||||||
cpu_cores=""
|
cpu_cores=""
|
||||||
disk_img=""
|
disk_img=""
|
||||||
disk_size=""
|
disk_size=""
|
||||||
|
extra_args=""
|
||||||
fixed_iso=""
|
fixed_iso=""
|
||||||
floppy=""
|
floppy=""
|
||||||
guest_os="linux"
|
guest_os="linux"
|
||||||
@ -1090,7 +1090,6 @@ ram=""
|
|||||||
secureboot="off"
|
secureboot="off"
|
||||||
tpm="off"
|
tpm="off"
|
||||||
usb_devices=()
|
usb_devices=()
|
||||||
extra_args=""
|
|
||||||
|
|
||||||
BRAILLE=""
|
BRAILLE=""
|
||||||
DELETE_DISK=0
|
DELETE_DISK=0
|
||||||
@ -1112,9 +1111,10 @@ VMDIR=""
|
|||||||
VMNAME=""
|
VMNAME=""
|
||||||
VMPATH=""
|
VMPATH=""
|
||||||
|
|
||||||
|
# shellcheck disable=SC2155
|
||||||
readonly LAUNCHER=$(basename "${0}")
|
readonly LAUNCHER=$(basename "${0}")
|
||||||
readonly DISK_MIN_SIZE=$((197632 * 8))
|
readonly DISK_MIN_SIZE=$((197632 * 8))
|
||||||
readonly VERSION="3.12"
|
readonly VERSION="3.13"
|
||||||
|
|
||||||
# PUBLICSHARE is the only directory exposed to guest VMs for file
|
# PUBLICSHARE is the only directory exposed to guest VMs for file
|
||||||
# sharing via 9P, spice-webdavd and Samba. This path is not configurable.
|
# sharing via 9P, spice-webdavd and Samba. This path is not configurable.
|
||||||
|
Loading…
Reference in New Issue
Block a user