Skip to content

Commit 5427ce8

Browse files
committed
FUSE is not possible
1 parent 4206137 commit 5427ce8

2 files changed

Lines changed: 5 additions & 44 deletions

File tree

AppDir/bin/start-waydroid.src.hook

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,5 @@
11
#!/bin/false
22

3-
_run_outside_fuse() {
4-
_rundir=${XDG_CACHE_HOME:-$HOME/.cache}/waydroid-AppImage
5-
mkdir -p "$_rundir"/bin
6-
7-
cp -f "$APPDIR"/sharun "$_rundir"
8-
cp -f "$APPDIR"/bin/waydroid* "$_rundir"/bin
9-
ln -sfn "$APPDIR"/bin/data "$_rundir"/bin
10-
ln -sfn "$APPDIR"/bin/tools "$_rundir"/bin
11-
12-
cp "$APPDIR"/.env "$_rundir" 2>/dev/null || :
13-
cp "$APPDIR"/.preload "$_rundir" 2>/dev/null || :
14-
15-
for pybin in "$APPDIR"/bin/python*; do
16-
case "$pybin" in
17-
*config)
18-
: # skip python config scripts
19-
;;
20-
*)
21-
[ -f "$pybin" ] || continue
22-
ln -f "$_rundir"/sharun "$_rundir"/bin/"${pybin##*/}"
23-
;;
24-
esac
25-
done
26-
27-
ln -sfn "$APPDIR"/lib "$_rundir"/lib
28-
ln -sfn "$APPDIR"/share "$_rundir"/share
29-
ln -sfn "$APPDIR"/shared "$_rundir"/shared
30-
ln -sfn "$APPDIR"/etc "$_rundir"/etc 2>/dev/null || :
31-
32-
PATH=$_rundir/bin:$PATH
33-
# override APPDIR now so that the AppRun launches the right binaries
34-
APPDIR=$_rundir
35-
36-
export PATH APPDIR
37-
}
38-
393
_is_cmd() {
404
for cmd do
415
command -v "$cmd" 1>/dev/null || return 1
@@ -159,7 +123,6 @@ else
159123
fi
160124

161125
_check_kernel
162-
_run_outside_fuse
163126
_install_polkit_policy || :
164127
_start_12to11
165128

make-appimage.sh

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,14 @@ quick-sharun \
3131
/usr/lib/libgbinder.so* \
3232
/usr/lib/libglibutil.so* \
3333
/usr/share/dbus-1 \
34+
/usr/share/polkit-1 \
3435
/usr/bin/zenity
35-
find ./AppDir/share/dbus-1 -type f ! -name '*waydro*' -delete
36-
37-
# add polkit policy file
38-
dst=./AppDir/share/polkit-1/actions
39-
mkdir -p "$dst"
40-
cp -v /usr/share/polkit-1/actions/id.waydro.Container.policy "$dst"
36+
find ./AppDir/share/dbus-1 ./AppDir/share/polkit-1 -type f ! -name '*waydro*' -delete
4137

4238
# Turn AppDir into AppImage
43-
quick-sharun --make-appimage
39+
# disable FUSE since we run into limitations with actions that require elevated rights
40+
echo 'unset APPIMAGE_EXTRACT_AND_RUN' >> ./AppDir/.env
41+
ADD_PERMA_ENV_VARS='APPIMAGE_EXTRACT_AND_RUN=1' quick-sharun --make-appimage
4442

4543
# Test the app for 12 seconds, if the test fails due to the app
4644
# having issues running in the CI use --simple-test instead

0 commit comments

Comments
 (0)