diff --git a/distribution/macos/updater.sh b/distribution/macos/updater.sh index 0854d4347..85d4f4926 100755 --- a/distribution/macos/updater.sh +++ b/distribution/macos/updater.sh @@ -25,13 +25,25 @@ error_handler() { exit 1 } +trap 'error_handler ${LINENO}' ERR + # Wait for Ryujinx to exit # NOTE: in case no fds are open, lsof could be returning with a process still living. -# We wait 1s and assume the process stopped after that -lsof -p $APP_PID +r 1 &>/dev/null -sleep 1 +# If the process is still acitve, we wait for 1 second and check it again. +# After the third time checking, this script exits with status 1 -trap 'error_handler ${LINENO}' ERR +attempt=0 +while [ attempt -lt 3 ]; do + if lsof -p $APP_PID +r 1 &>/dev/null; then + if [ attempt -eq 2 ]; then + exit 1 + fi + sleep 1 + else + break + fi + (( attempt++ )) +done # Now replace and reopen. rm -rf "$INSTALL_DIRECTORY"