diff options
| author | Gunnar Beutner <gbeutner@serenityos.org> | 2021-08-02 12:05:02 +0200 |
|---|---|---|
| committer | Linus Groh <mail@linusgroh.de> | 2021-08-02 11:47:29 +0100 |
| commit | 74af43ed9778c28cba6865ceffceb6998bac17e3 (patch) | |
| tree | bc366de24f7c6dd6d0eb47c5ce1a5a1f5fb6a76b | |
| parent | de7f1bfd58c13decf1bd3957468520f301189292 (diff) | |
| download | serenity-74af43ed9778c28cba6865ceffceb6998bac17e3.zip | |
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.
| -rwxr-xr-x | Meta/run.sh | 4 |
1 files changed, 2 insertions, 2 deletions
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}" |