mirror/bazzite
1
0
Fork 0
mirror of https://github.com/ublue-os/bazzite.git synced 2025-03-28 19:20:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: Move waydroid scripts to libexec

Browse Source
This commit is contained in:
Kyle Gospodnetich 2023-11-03 00:18:51 -07:00
parent 17ffc696e1
commit b63c1de6f7
6 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
system_files/desktop/shared/usr/bin/cec-control
View File

@ -21,4 +21,5 @@ elif [ "${ACTION}" = "onpoweroff" ] && [ "$CEC_ONPOWEROFF_STANDBY" = true ]; the
elif [ "${ACTION}" = "onsleep" ] && [ "$CEC_ONSLEEP_STANDBY" = true ]; then elif [ "${ACTION}" = "onsleep" ] && [ "$CEC_ONSLEEP_STANDBY" = true ]; then
echo "standby $CEC_TVID" | cec-client -s -d 1 echo "standby $CEC_TVID" | cec-client -s -d 1
fi fi
exit 0 exit 0

8
system_files/desktop/shared/usr/bin/waydroid-launcher
View File

@ -4,7 +4,7 @@ source /etc/default/waydroid-launcher
# Kill any previous remnants # Kill any previous remnants
if [ "$(systemctl is-active waydroid-container.service)" == 'active' ]; then if [ "$(systemctl is-active waydroid-container.service)" == 'active' ]; then
pkexec /usr/bin/waydroid-container-stop pkexec /usr/libexec/waydroid-container-stop
fi fi
# Check if Waydroid is initialized, initialize if not # Check if Waydroid is initialized, initialize if not
@ -14,7 +14,7 @@ fi
# Launch Weston # Launch Weston
killall -9 weston killall -9 weston
pkexec /usr/bin/waydroid-container-start pkexec /usr/libexec/waydroid-container-start
if [ -z "$(pgrep weston)" ]; then if [ -z "$(pgrep weston)" ]; then
/usr/bin/weston --socket=weston-waydroid --width=${WAYDROID_WIDTH:-1280} --height=${WAYDROID_HEIGHT:-800} &> /dev/null & /usr/bin/weston --socket=weston-waydroid --width=${WAYDROID_WIDTH:-1280} --height=${WAYDROID_HEIGHT:-800} &> /dev/null &
fi fi
@ -30,7 +30,7 @@ LAUNCH_PARAM=$@
while [ "" == "$(pgrep surfaceflinger)" ]; do while [ "" == "$(pgrep surfaceflinger)" ]; do
sleep 1 sleep 1
done done
pkexec /usr/bin/waydroid-fix-controllers pkexec /usr/libexec/waydroid-fix-controllers
# Waydroid is now live! # Waydroid is now live!
# Wait for exit and then clean up # Wait for exit and then clean up
@ -38,4 +38,4 @@ while [ -n "$(pgrep weston)" ]; do
sleep 1 sleep 1
done done
pkexec /usr/bin/waydroid-container-stop pkexec /usr/libexec/waydroid-container-stop

0
system_files/desktop/shared/usr/bin/waydroid-container-start → system_files/desktop/shared/usr/libexec/waydroid-container-start
View File

0
system_files/desktop/shared/usr/bin/waydroid-container-stop → system_files/desktop/shared/usr/libexec/waydroid-container-stop
View File

0
system_files/desktop/shared/usr/bin/waydroid-fix-controllers → system_files/desktop/shared/usr/libexec/waydroid-fix-controllers
View File

6
system_files/desktop/shared/usr/share/polkit-1/actions/org.bazzite.waydroid.policy
View File

@ -14,7 +14,7 @@
<allow_inactive>yes</allow_inactive> <allow_inactive>yes</allow_inactive>
<allow_active>yes</allow_active> <allow_active>yes</allow_active>
</defaults> </defaults>
<annotate key="org.freedesktop.policykit.exec.path">/usr/bin/waydroid-container-start</annotate> <annotate key="org.freedesktop.policykit.exec.path">/usr/libexec/waydroid-container-start</annotate>
</action> </action>
<action id="org.bazzite.policykit.waydroid.container.stop"> <action id="org.bazzite.policykit.waydroid.container.stop">
@ -25,7 +25,7 @@
<allow_inactive>yes</allow_inactive> <allow_inactive>yes</allow_inactive>
<allow_active>yes</allow_active> <allow_active>yes</allow_active>
</defaults> </defaults>
<annotate key="org.freedesktop.policykit.exec.path">/usr/bin/waydroid-container-stop</annotate> <annotate key="org.freedesktop.policykit.exec.path">/usr/libexec/waydroid-container-stop</annotate>
</action> </action>
<action id="org.bazzite.policykit.waydroid.fix.controllers"> <action id="org.bazzite.policykit.waydroid.fix.controllers">
@ -36,6 +36,6 @@
<allow_inactive>yes</allow_inactive> <allow_inactive>yes</allow_inactive>
<allow_active>yes</allow_active> <allow_active>yes</allow_active>
</defaults> </defaults>
<annotate key="org.freedesktop.policykit.exec.path">/usr/bin/waydroid-fix-controllers</annotate> <annotate key="org.freedesktop.policykit.exec.path">/usr/libexec/waydroid-fix-controllers</annotate>
</action> </action>
</policyconfig> </policyconfig>