marcel/winapps
1
0
Fork 0
mirror of https://github.com/winapps-org/winapps.git synced 2025-09-19 15:59:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Further fixes for #638

Browse Source 
Signed-off-by: Rohan Barar <rohan.barar@gmail.com>
This commit is contained in:
Rohan Barar
2025-09-04 21:44:42 +10:00
parent b203b6d252
commit a6a51b2ccf
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
bin/winapps
View File

@@ -322,28 +322,28 @@ function waCheckVMRunning() {
# Attempt to run the Windows virtual machine. # Attempt to run the Windows virtual machine.
# Note: States 'running' and 'idle' do not require intervention, and are not checked for. # Note: States 'running' and 'idle' do not require intervention, and are not checked for.
if (virsh list --all --name | xargs | grep -wq "$VM_NAME"); then if (virsh list --all --name | grep -Fxq -- "$VM_NAME"); then
if (virsh list --state-shutoff --name | xargs | grep -wq "$VM_NAME"); then if (virsh list --state-shutoff --name | grep -Fxq -- "$VM_NAME"); then
dprint "WINDOWS SHUT OFF. BOOTING WINDOWS." dprint "WINDOWS SHUT OFF. BOOTING WINDOWS."
notify-send --expire-time=4000 --icon="dialog-info" --app-name="WinApps" --urgency="low" "WinApps" "Booting Windows." notify-send --expire-time=4000 --icon="dialog-info" --app-name="WinApps" --urgency="low" "WinApps" "Booting Windows."
NEEDED_BOOT=true NEEDED_BOOT=true
virsh start "$VM_NAME" &>/dev/null || EXIT_STATUS=$EC_FAIL_START virsh start "$VM_NAME" &>/dev/null || EXIT_STATUS=$EC_FAIL_START
if (virsh list --state-paused --name | xargs | grep -wq "$VM_NAME"); then if (virsh list --state-paused --name | grep -Fxq -- "$VM_NAME"); then
dprint "WINDOWS PAUSED. RESUMING WINDOWS." dprint "WINDOWS PAUSED. RESUMING WINDOWS."
notify-send --expire-time=4000 --icon="dialog-info" --app-name="WinApps" --urgency="low" "WinApps" "Resuming Windows." notify-send --expire-time=4000 --icon="dialog-info" --app-name="WinApps" --urgency="low" "WinApps" "Resuming Windows."
virsh resume "$VM_NAME" &>/dev/null || EXIT_STATUS=$EC_FAIL_RESUME virsh resume "$VM_NAME" &>/dev/null || EXIT_STATUS=$EC_FAIL_RESUME
fi fi
elif (virsh list --state-paused --name | xargs | grep -wq "$VM_NAME"); then elif (virsh list --state-paused --name | grep -Fxq -- "$VM_NAME"); then
dprint "WINDOWS PAUSED. RESUMING WINDOWS." dprint "WINDOWS PAUSED. RESUMING WINDOWS."
notify-send --expire-time=4000 --icon="dialog-info" --app-name="WinApps" --urgency="low" "WinApps" "Resuming Windows." notify-send --expire-time=4000 --icon="dialog-info" --app-name="WinApps" --urgency="low" "WinApps" "Resuming Windows."
virsh resume "$VM_NAME" &>/dev/null || EXIT_STATUS=$EC_FAIL_RESUME virsh resume "$VM_NAME" &>/dev/null || EXIT_STATUS=$EC_FAIL_RESUME
elif (virsh list --state-other --name | xargs | grep -wq "$VM_NAME"); then elif (virsh list --state-other --name | grep -Fxq -- "$VM_NAME"); then
if (virsh domstate "$VM_NAME" | xargs | grep -wq "shutdown"); then if (virsh domstate "$VM_NAME" | grep -Fxq "in shutdown"); then
dprint "WINDOWS SHUTTING DOWN. WAITING." dprint "WINDOWS SHUTTING DOWN. WAITING."
notify-send --expire-time=4000 --icon="dialog-info" --app-name="WinApps" --urgency="low" "WinApps" "Windows is currently shutting down.\nIt will automatically restart once the shutdown process is complete." notify-send --expire-time=4000 --icon="dialog-info" --app-name="WinApps" --urgency="low" "WinApps" "Windows is currently shutting down.\nIt will automatically restart once the shutdown process is complete."
EXIT_STATUS=$EC_SD_TIMEOUT EXIT_STATUS=$EC_SD_TIMEOUT
while (( TIME_ELAPSED < TIME_LIMIT )); do while (( TIME_ELAPSED < TIME_LIMIT )); do
if (virsh list --state-shutoff --name | xargs | grep -wq "$VM_NAME"); then if (virsh list --state-shutoff --name | grep -Fxq -- "$VM_NAME"); then
EXIT_STATUS=0 EXIT_STATUS=0
dprint "WINDOWS SHUT OFF. BOOTING WINDOWS." dprint "WINDOWS SHUT OFF. BOOTING WINDOWS."
notify-send --expire-time=4000 --icon="dialog-info" --app-name="WinApps" --urgency="low" "WinApps" "Booting Windows." notify-send --expire-time=4000 --icon="dialog-info" --app-name="WinApps" --urgency="low" "WinApps" "Booting Windows."
@@ -354,7 +354,7 @@ function waCheckVMRunning() {
sleep $TIME_INTERVAL sleep $TIME_INTERVAL
TIME_ELAPSED=$((TIME_ELAPSED + TIME_INTERVAL)) TIME_ELAPSED=$((TIME_ELAPSED + TIME_INTERVAL))
done done
elif (virsh domstate "$VM_NAME" | xargs | grep -wq "crashed"); then elif (virsh domstate "$VM_NAME" | grep -Fxq "crashed"); then
dprint "WINDOWS CRASHED. DESTROYING WINDOWS." dprint "WINDOWS CRASHED. DESTROYING WINDOWS."
notify-send --expire-time=4000 --icon="dialog-info" --app-name="WinApps" --urgency="low" "WinApps" "Windows experienced an unexpected crash.\nAttempting to restart Windows." notify-send --expire-time=4000 --icon="dialog-info" --app-name="WinApps" --urgency="low" "WinApps" "Windows experienced an unexpected crash.\nAttempting to restart Windows."
virsh destroy "$VM_NAME" &>/dev/null || EXIT_STATUS=$EC_FAIL_DESTROY virsh destroy "$VM_NAME" &>/dev/null || EXIT_STATUS=$EC_FAIL_DESTROY
@@ -364,12 +364,12 @@ function waCheckVMRunning() {
virsh start "$VM_NAME" &>/dev/null || EXIT_STATUS=$EC_FAIL_START virsh start "$VM_NAME" &>/dev/null || EXIT_STATUS=$EC_FAIL_START
NEEDED_BOOT=true NEEDED_BOOT=true
fi fi
elif (virsh domstate "$VM_NAME" | xargs | grep -wq "dying"); then elif (virsh domstate "$VM_NAME" | grep -Fxq "dying"); then
dprint "WINDOWS DYING. WAITING." dprint "WINDOWS DYING. WAITING."
notify-send --expire-time=4000 --icon="dialog-info" --app-name="WinApps" --urgency="low" "WinApps" "Windows is currently shutting down unexpectedly.\nIt will try to restart once the shutdown process finishes." notify-send --expire-time=4000 --icon="dialog-info" --app-name="WinApps" --urgency="low" "WinApps" "Windows is currently shutting down unexpectedly.\nIt will try to restart once the shutdown process finishes."
EXIT_STATUS=$EC_DIE_TIMEOUT EXIT_STATUS=$EC_DIE_TIMEOUT
while (( TIME_ELAPSED < TIME_LIMIT )); do while (( TIME_ELAPSED < TIME_LIMIT )); do
if (virsh domstate "$VM_NAME" | xargs | grep -wq "crashed"); then if (virsh domstate "$VM_NAME" | grep -Fxq "crashed"); then
EXIT_STATUS=0 EXIT_STATUS=0
dprint "WINDOWS CRASHED. DESTROYING WINDOWS." dprint "WINDOWS CRASHED. DESTROYING WINDOWS."
notify-send --expire-time=4000 --icon="dialog-info" --app-name="WinApps" --urgency="low" "WinApps" "Windows experienced an unexpected crash.\nAttempting to restart Windows." notify-send --expire-time=4000 --icon="dialog-info" --app-name="WinApps" --urgency="low" "WinApps" "Windows experienced an unexpected crash.\nAttempting to restart Windows."
@@ -381,7 +381,7 @@ function waCheckVMRunning() {
NEEDED_BOOT=true NEEDED_BOOT=true
fi fi
break break
elif (virsh list --state-shutoff --name | xargs | grep -wq "$VM_NAME"); then elif (virsh list --state-shutoff --name | grep -Fxq -- "$VM_NAME"); then
EXIT_STATUS=0 EXIT_STATUS=0
dprint "WINDOWS SHUT OFF. BOOTING WINDOWS." dprint "WINDOWS SHUT OFF. BOOTING WINDOWS."
notify-send --expire-time=4000 --icon="dialog-info" --app-name="WinApps" --urgency="low" "WinApps" "Booting Windows." notify-send --expire-time=4000 --icon="dialog-info" --app-name="WinApps" --urgency="low" "WinApps" "Booting Windows."
@@ -392,7 +392,7 @@ function waCheckVMRunning() {
sleep $TIME_INTERVAL sleep $TIME_INTERVAL
TIME_ELAPSED=$((TIME_ELAPSED + TIME_INTERVAL)) TIME_ELAPSED=$((TIME_ELAPSED + TIME_INTERVAL))
done done
elif (virsh domstate "$VM_NAME" | xargs | grep -wq "pmsuspended" ); then elif (virsh domstate "$VM_NAME" | grep -Fxq "pmsuspended" ); then
dprint "WINDOWS SUSPENDED. RESUMING WINDOWS." dprint "WINDOWS SUSPENDED. RESUMING WINDOWS."
virsh resume "$VM_NAME" &>/dev/null || EXIT_STATUS=$EC_FAIL_RESUME virsh resume "$VM_NAME" &>/dev/null || EXIT_STATUS=$EC_FAIL_RESUME
fi fi
@@ -413,7 +413,7 @@ function waCheckVMRunning() {
while (( TIME_ELAPSED < BOOT_TIMEOUT )); do while (( TIME_ELAPSED < BOOT_TIMEOUT )); do
# Check if VM is running # Check if VM is running
if (virsh list --state-running --name | xargs | grep -wq "$VM_NAME"); then if (virsh list --state-running --name | grep -Fxq -- "$VM_NAME"); then
# Try to connect to RDP port to verify it's ready # Try to connect to RDP port to verify it's ready
if timeout 1 bash -c ">/dev/tcp/$RDP_IP/$RDP_PORT" 2>/dev/null; then if timeout 1 bash -c ">/dev/tcp/$RDP_IP/$RDP_PORT" 2>/dev/null; then
dprint "VM IS READY" dprint "VM IS READY"

6
setup.sh
View File

@@ -840,11 +840,11 @@ function waCheckVMRunning() {
# Obtain VM Status # Obtain VM Status
VM_PAUSED=0 VM_PAUSED=0
virsh list --state-paused --name | grep -Fxq "$VM_NAME" || VM_PAUSED="$?" virsh list --state-paused --name | grep -Fxq -- "$VM_NAME" || VM_PAUSED="$?"
VM_RUNNING=0 VM_RUNNING=0
virsh list --state-running --name | grep -Fxq "$VM_NAME" || VM_RUNNING="$?" virsh list --state-running --name | grep -Fxq -- "$VM_NAME" || VM_RUNNING="$?"
VM_SHUTOFF=0 VM_SHUTOFF=0
virsh list --state-shutoff --name | grep -Fxq "$VM_NAME" || VM_SHUTOFF="$?" virsh list --state-shutoff --name | grep -Fxq -- "$VM_NAME" || VM_SHUTOFF="$?"
if [[ $VM_SHUTOFF == "0" ]]; then if [[ $VM_SHUTOFF == "0" ]]; then
# Complete the previous line. # Complete the previous line.