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

refactor: consolidate fullscreen variable

This commit is contained in:
Martin Wimpress 2024-05-13 00:28:24 +01:00 committed by Martin Wimpress
parent faa24eb7f2
commit 7163384c3c
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
quickemu
View File

@ -893,7 +893,7 @@ function vm_boot() {
if [ "${guest_os}" != "macos" ] && [ -n "${PUBLIC}" ]; then if [ "${guest_os}" != "macos" ] && [ -n "${PUBLIC}" ]; then
echo -n " --spice-shared-dir ${PUBLIC}" echo -n " --spice-shared-dir ${PUBLIC}"
fi fi
echo "${FULLSPICY}" echo "${FULLSCREEN}"
SPICE="${SPICE},port=${SPICE_PORT},addr=${SPICE_ADDR}" SPICE="${SPICE},port=${SPICE_PORT},addr=${SPICE_ADDR}"
fi fi
fi fi
@ -1323,24 +1323,24 @@ function start_viewer {
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}\" ${FULLSCREEN} \"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}" ${FULLSCREEN} "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}\" ${FULLSCREEN} \"spice://localhost:${SPICE_PORT}\" >/dev/null 2>&1 &"
${viewer} --title "${VMNAME}" ${FULLSPICY} "spice://localhost:${SPICE_PORT}" >/dev/null 2>&1 & ${viewer} --title "${VMNAME}" ${FULLSCREEN} "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}\" \"${FULLSCREEN}\" >/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}" "${FULLSCREEN}" >/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}\" \"${FULLSCREEN}\" >/dev/null 2>&1 &"
${viewer} --title "${VMNAME}" --port "${SPICE_PORT}" "${FULLSPICY}" >/dev/null 2>&1 & ${viewer} --title "${VMNAME}" --port "${SPICE_PORT}" "${FULLSCREEN}" >/dev/null 2>&1 &
errno=$? errno=$?
fi fi
fi fi
@ -1570,7 +1570,6 @@ BRAILLE=""
DELETE_DISK=0 DELETE_DISK=0
DELETE_VM=0 DELETE_VM=0
FULLSCREEN="" FULLSCREEN=""
FULLSPICY=""
KILL_VM=0 KILL_VM=0
PUBLIC="" PUBLIC=""
PUBLIC_PERMS="" PUBLIC_PERMS=""
@ -1639,8 +1638,7 @@ else
display_param_check display_param_check
shift 2;; shift 2;;
-fullscreen|--fullscreen|-full-screen|--full-screen) -fullscreen|--fullscreen|-full-screen|--full-screen)
FULLSCREEN="-full-screen" FULLSCREEN="--full-screen"
FULLSPICY="--full-screen"
shift;; shift;;
-ignore-msrs-always|--ignore-msrs-always) -ignore-msrs-always|--ignore-msrs-always)
ignore_msrs_always ignore_msrs_always