Skip to content

Commit

Permalink
feat(waydroid): Add new Waydroid launcher to streamline use
Browse files Browse the repository at this point in the history
  • Loading branch information
KyleGospo committed Oct 2, 2023
1 parent a4fce79 commit 708b25e
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Containerfile
Expand Up @@ -237,7 +237,7 @@ RUN /tmp/image-info.sh && \
; fi && \
if grep -qv "nvidia" <<< "${IMAGE_NAME}"; then \
systemctl disable waydroid-container.service && \
sed -i 's@Exec=waydroid first-launch@Exec=/usr/bin/waydroid-launcher@g' /usr/share/applications/Waydroid.desktop && \
sed -i 's@Exec=waydroid@Exec=/usr/bin/waydroid-launcher@g' /usr/share/applications/Waydroid.desktop && \
rm /usr/share/wayland-sessions/weston.desktop \
; fi && \
mkdir -p /usr/etc/default && \
Expand Down
6 changes: 3 additions & 3 deletions system_files/desktop/shared/usr/bin/waydroid-launcher
Expand Up @@ -11,13 +11,13 @@ fi
killall -9 weston
pkexec /usr/bin/waydroid-container-start
if [ -z "$(pgrep weston)" ]; then
/usr/bin/weston --xwayland --width="${WAYDROID_WIDTH}" --height="${WAYDROID_HEIGHT}" &> /dev/null &
/usr/bin/weston --socket=weston-waydroid --width=${WAYDROID_WIDTH} --height=${WAYDROID_HEIGHT} &> /dev/null &
fi

sleep 2 &&
export XDG_SESSION_TYPE='wayland'
export DISPLAY=':1'
/usr/bin/waydroid show-full-ui &
export WAYLAND_DISPLAY='weston-waydroid'
/usr/bin/waydroid $@ &
while [ -n "$(pgrep weston)" ];do
sleep 1
done
Expand Down
4 changes: 4 additions & 0 deletions system_files/desktop/shared/usr/etc/xdg/weston/weston.ini
@@ -0,0 +1,4 @@
[shell]
clock-format=none
panel-position=none
background-color=0xff000000

0 comments on commit 708b25e

Please sign in to comment.