From a19bb5fd83bed1177ccbe5bb900c0695a15ad6d1 Mon Sep 17 00:00:00 2001 From: Hosh Date: Mon, 27 May 2024 00:11:37 +0100 Subject: [PATCH] exec waydroid + use exported function --- system_files/desktop/shared/usr/bin/waydroid-launcher | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/system_files/desktop/shared/usr/bin/waydroid-launcher b/system_files/desktop/shared/usr/bin/waydroid-launcher index 4d0f98b5..73f12a6a 100755 --- a/system_files/desktop/shared/usr/bin/waydroid-launcher +++ b/system_files/desktop/shared/usr/bin/waydroid-launcher @@ -19,10 +19,18 @@ if grep -qz 'not initialized' <<< $(/usr/bin/waydroid status); then /usr/bin/ujust init-waydroid fi +launch_waydroid() { + wlr-randr --output X11-1 --custom-mode "$1" + sleep 1 + shift + exec waydroid "$@" &> /dev/null +} +export -f launch_waydroid + # Launch Cage & Waydroid pkexec /usr/libexec/waydroid-container-start if [ -z "$(pgrep wlr-randr)" ]; then - cage -- bash -uxc 'wlr-randr --output X11-1 --custom-mode "$1"; sleep 1; shift; waydroid "$@" &> /dev/null' _ "${WAYDROID_WIDTH:-1280}x${WAYDROID_HEIGHT:-800}" "$@" & + cage -- bash -uxc 'launch_waydroid "$@"' _ "${WAYDROID_WIDTH:-1280}x${WAYDROID_HEIGHT:-800}" "$@" & fi # Fix controllers, we know Waydroid has started because surfaceflinger is running