Skip to content

Commit 708b25e

Browse files
committed
feat(waydroid): Add new Waydroid launcher to streamline use
1 parent a4fce79 commit 708b25e

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

Containerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ RUN /tmp/image-info.sh && \
237237
; fi && \
238238
if grep -qv "nvidia" <<< "${IMAGE_NAME}"; then \
239239
systemctl disable waydroid-container.service && \
240-
sed -i 's@Exec=waydroid first-launch@Exec=/usr/bin/waydroid-launcher@g' /usr/share/applications/Waydroid.desktop && \
240+
sed -i 's@Exec=waydroid@Exec=/usr/bin/waydroid-launcher@g' /usr/share/applications/Waydroid.desktop && \
241241
rm /usr/share/wayland-sessions/weston.desktop \
242242
; fi && \
243243
mkdir -p /usr/etc/default && \

system_files/desktop/shared/usr/bin/waydroid-launcher

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ fi
1111
killall -9 weston
1212
pkexec /usr/bin/waydroid-container-start
1313
if [ -z "$(pgrep weston)" ]; then
14-
/usr/bin/weston --xwayland --width="${WAYDROID_WIDTH}" --height="${WAYDROID_HEIGHT}" &> /dev/null &
14+
/usr/bin/weston --socket=weston-waydroid --width=${WAYDROID_WIDTH} --height=${WAYDROID_HEIGHT} &> /dev/null &
1515
fi
1616

1717
sleep 2 &&
1818
export XDG_SESSION_TYPE='wayland'
19-
export DISPLAY=':1'
20-
/usr/bin/waydroid show-full-ui &
19+
export WAYLAND_DISPLAY='weston-waydroid'
20+
/usr/bin/waydroid $@ &
2121
while [ -n "$(pgrep weston)" ];do
2222
sleep 1
2323
done
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[shell]
2+
clock-format=none
3+
panel-position=none
4+
background-color=0xff000000

0 commit comments

Comments
 (0)