RomanNum3ral
/
quickemu
mirror of https://github.com/quickemu-project/quickemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor: clean up viewer variables

This commit is contained in:
Martin Wimpress 2024-05-13 00:25:16 +01:00 committed by Martin Wimpress
parent edcc5a0f43
commit faa24eb7f2
1 changed files with 19 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
quickemu
View File

@ -1316,38 +1316,36 @@ function vm_boot() {
function start_viewer { function start_viewer {
errno=0 errno=0
if [ "${VIEWER}" != "none" ]; then if [ "${viewer}" != "none" ]; then
# If output is 'none' then SPICE was requested. # If output is 'none' then SPICE was requested.
if [ "${display}" == "spice" ]; then if [ "${display}" == "spice" ]; then
if [ "${VIEWER}" == "remote-viewer" ]; then if [ "${viewer}" == "remote-viewer" ]; then
# show via viewer: remote-viewer # show via viewer: remote-viewer
if [ -n "${PUBLIC}" ]; then if [ -n "${PUBLIC}" ]; then
echo " - Viewer: ${VIEWER} --title \"${VMNAME}\" --spice-shared-dir \"${PUBLIC}\" ${FULLSPICY} \"spice://localhost:${SPICE_PORT}\" >/dev/null 2>&1 &" echo " - Viewer: ${viewer} --title \"${VMNAME}\" --spice-shared-dir \"${PUBLIC}\" ${FULLSPICY} \"spice://localhost:${SPICE_PORT}\" >/dev/null 2>&1 &"
${VIEWER} --title "${VMNAME}" --spice-shared-dir "${PUBLIC}" ${FULLSPICY} "spice://localhost:${SPICE_PORT}" >/dev/null 2>&1 & ${viewer} --title "${VMNAME}" --spice-shared-dir "${PUBLIC}" ${FULLSPICY} "spice://localhost:${SPICE_PORT}" >/dev/null 2>&1 &
errno=$? errno=$?
else else
echo " - Viewer: ${VIEWER} --title \"${VMNAME}\" ${FULLSPICY} \"spice://localhost:${SPICE_PORT}\" >/dev/null 2>&1 &" echo " - Viewer: ${viewer} --title \"${VMNAME}\" ${FULLSPICY} \"spice://localhost:${SPICE_PORT}\" >/dev/null 2>&1 &"
${VIEWER} --title "${VMNAME}" ${FULLSPICY} "spice://localhost:${SPICE_PORT}" >/dev/null 2>&1 & ${viewer} --title "${VMNAME}" ${FULLSPICY} "spice://localhost:${SPICE_PORT}" >/dev/null 2>&1 &
errno=$? errno=$?
fi fi
elif [ "${VIEWER}" == "spicy" ]; then elif [ "${viewer}" == "spicy" ]; then
# show via viewer: spicy # show via viewer: spicy
if [ -n "${PUBLIC}" ]; then if [ -n "${PUBLIC}" ]; then
echo " - Viewer: ${VIEWER} --title \"${VMNAME}\" --port \"${SPICE_PORT}\" --spice-shared-dir \"${PUBLIC}\" \"${FULLSPICY}\" >/dev/null 2>&1 &" echo " - Viewer: ${viewer} --title \"${VMNAME}\" --port \"${SPICE_PORT}\" --spice-shared-dir \"${PUBLIC}\" \"${FULLSPICY}\" >/dev/null 2>&1 &"
${VIEWER} --title "${VMNAME}" --port "${SPICE_PORT}" --spice-shared-dir "${PUBLIC}" "${FULLSPICY}" >/dev/null 2>&1 & ${viewer} --title "${VMNAME}" --port "${SPICE_PORT}" --spice-shared-dir "${PUBLIC}" "${FULLSPICY}" >/dev/null 2>&1 &
errno=$? errno=$?
else else
echo " - Viewer: ${VIEWER} --title \"${VMNAME}\" --port \"${SPICE_PORT}\" \"${FULLSPICY}\" >/dev/null 2>&1 &" echo " - Viewer: ${viewer} --title \"${VMNAME}\" --port \"${SPICE_PORT}\" \"${FULLSPICY}\" >/dev/null 2>&1 &"
${VIEWER} --title "${VMNAME}" --port "${SPICE_PORT}" "${FULLSPICY}" >/dev/null 2>&1 & ${viewer} --title "${VMNAME}" --port "${SPICE_PORT}" "${FULLSPICY}" >/dev/null 2>&1 &
errno=$? errno=$?
fi fi
fi fi
if [ $errno -ne 0 ]; then if [ ${errno} -ne 0 ]; then
echo "WARNING! Could not start viewer(${VIEWER}) Err: $errno" echo "WARNING! Could not start viewer (${viewer}) Err: ${errno}"
fi fi
fi fi
fi fi
@ -1442,14 +1440,14 @@ function sound_card_param_check() {
} }
function viewer_param_check() { function viewer_param_check() {
if [ "${VIEWER}" != "none" ] && [ "${VIEWER}" != "spicy" ] && [ "${VIEWER}" != "remote-viewer" ]; then if [ "${viewer}" != "none" ] && [ "${viewer}" != "spicy" ] && [ "${viewer}" != "remote-viewer" ]; then
echo "ERROR! Requested viewer '${VIEWER}' is not recognised." echo "ERROR! Requested viewer '${viewer}' is not recognised."
exit 1 exit 1
fi fi
if [ "${VIEWER}" == "spicy" ] && ! command -v spicy &>/dev/null; then if [ "${viewer}" == "spicy" ] && ! command -v spicy &>/dev/null; then
echo "ERROR! Requested 'spicy' as viewer, but 'spicy' is not installed." echo "ERROR! Requested 'spicy' as viewer, but 'spicy' is not installed."
exit 1 exit 1
elif [ "${VIEWER}" == "remote-viewer" ] && ! command -v remote-viewer &>/dev/null; then elif [ "${viewer}" == "remote-viewer" ] && ! command -v remote-viewer &>/dev/null; then
echo "ERROR! Requested 'remote-viewer' as viewer, but 'remote-viewer' is not installed." echo "ERROR! Requested 'remote-viewer' as viewer, but 'remote-viewer' is not installed."
exit 1 exit 1
fi fi
@ -1545,7 +1543,7 @@ ram=""
secureboot="off" secureboot="off"
tpm="off" tpm="off"
usb_devices=() usb_devices=()
viewer="spicy" viewer="${viewer:-spicy}"
width="${width:-}" width="${width:-}"
height="${height:-}" height="${height:-}"
ssh_port="" ssh_port=""
@ -1586,7 +1584,6 @@ VM=""
VMDIR="" VMDIR=""
VMNAME="" VMNAME=""
VMPATH="" VMPATH=""
VIEWER=""
SSH_PORT="" SSH_PORT=""
SPICE_PORT="" SPICE_PORT=""
MONITOR="" MONITOR=""
@ -1677,7 +1674,7 @@ else
VM="${2}" VM="${2}"
shift 2;; shift 2;;
-viewer|--viewer) -viewer|--viewer)
VIEWER="${2}" viewer="${2}"
shift 2;; shift 2;;
-width|--width) -width|--width)
width="${2}" width="${2}"
@ -1775,10 +1772,6 @@ if [ -n "${VM}" ] && [ -e "${VM}" ]; then
display="sdl" display="sdl"
fi fi
display_param_check display_param_check
if [ -z "${VIEWER}" ]; then
VIEWER="${viewer}"
fi
viewer_param_check viewer_param_check
# Set the default 3D acceleration. # Set the default 3D acceleration.