From 74af43ed9778c28cba6865ceffceb6998bac17e3 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Mon, 2 Aug 2021 12:05:02 +0200 Subject: Meta: Improve WSL detection for the run.sh script For users who use a custom kernel with WSL our previous method of detecting WSL doesn't work. This new check instead detects WSL by checking if the wslpath utility is available. --- Meta/run.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Meta/run.sh') diff --git a/Meta/run.sh b/Meta/run.sh index 9af23ba168..1af3902e8f 100755 --- a/Meta/run.sh +++ b/Meta/run.sh @@ -96,7 +96,7 @@ fi if [ "$(uname)" = "Darwin" ]; then SERENITY_AUDIO_BACKEND="-audiodev coreaudio,id=snd0" -elif (uname -a | grep -iq WSL) || (uname -a | grep -iq microsoft); then +elif command -v wslpath >/dev/null; then SERENITY_AUDIO_BACKEND="-audiodev dsound,id=snd0" elif "$SERENITY_QEMU_BIN" -audio-help 2>&1 | grep -- "-audiodev id=sdl" >/dev/null; then SERENITY_AUDIO_BACKEND="-audiodev sdl,id=snd0" @@ -113,7 +113,7 @@ fi SERENITY_SCREENS="${SERENITY_SCREENS:-1}" if [ "$SERENITY_SPICE" ]; then SERENITY_QEMU_DISPLAY_BACKEND="${SERENITY_QEMU_DISPLAY_BACKEND:-spice-app}" -elif (uname -a | grep -iq WSL) || (uname -a | grep -iq microsoft); then +elif command -v wslpath >/dev/null; then # QEMU for windows does not like gl=on, so detect if we are building in wsl, and if so, disable it # Also, when using the GTK backend we run into this problem: https://github.com/SerenityOS/serenity/issues/7657 SERENITY_QEMU_DISPLAY_BACKEND="${SERENITY_QEMU_DISPLAY_BACKEND:-sdl,gl=off}" -- cgit v1.2.3