anbox: Switch to default wayland display

diff --git a/scripts/generate-props.sh b/scripts/generate-props.sh
index 07ef734f25581e09e5efb6b2a7d76c345f566739..eff8f9ac9355fb232cd2b134fa21ed5546c15034 100755 (executable)
--- a/scripts/generate-props.sh
+++ b/scripts/generate-props.sh
@@ -79,8 +79,6 @@ if [ ! -z $XDG_RUNTIME_DIR ]; then
     XDG_PROP="anbox.xdg_runtime_dir=${XDG_RUNTIME_DIR}"
 fi
 
     XDG_PROP="anbox.xdg_runtime_dir=${XDG_RUNTIME_DIR}"
 fi
 

-#TODO: Do Not force wayland display 1
-WAYLAND_DISPLAY="wayland-1"

 if [ ! -z $WAYLAND_DISPLAY ]; then
     WAYLAND_DISP_PROP="anbox.wayland_display=${WAYLAND_DISPLAY}"
 fi
 if [ ! -z $WAYLAND_DISPLAY ]; then
     WAYLAND_DISP_PROP="anbox.wayland_display=${WAYLAND_DISPLAY}"
 fi

diff --git a/scripts/install.sh b/scripts/install.sh
index f7fa9815c0de2a58c70fa7d0ca97426c1647f0cf..916df1bb5e5cfa4a36802b13e6dbb1f0fca9d049 100644 (file)
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -48,7 +48,7 @@ fi
 
 echo "Installing packages"
 apt update
 
 echo "Installing packages"
 apt update

-apt install -y lxc1 qtwayland5 qml-module-qtwayland-compositor
+apt install -y lxc1

 apt install -y libgbinder sensorfw-qt5 libsensorfw-qt5-plugins || touch NO_SENSORS
 if [ ! -f NO_SENSORS ]; then
     rm anbox-sensors_0.1.0_${ARCH}.deb
 apt install -y libgbinder sensorfw-qt5 libsensorfw-qt5-plugins || touch NO_SENSORS
 if [ ! -f NO_SENSORS ]; then
     rm anbox-sensors_0.1.0_${ARCH}.deb


@@ -140,11 +140,6 @@ echo "Going back to phablet user"
 EOF
 cd /home/phablet
 
 EOF
 cd /home/phablet
 

-echo "Installing anbox launcher"
-rm anbox.rudiimmer_1.0_all.click
-wget https://build.lolinet.com/file/lineage/anbox_${ARCH}/anbox.rudiimmer_1.0_all.click
-pkcon install-local anbox.rudiimmer_1.0_all.click --allow-untrusted
-

 echo "Restarting Pulseaudio service"
 initctl --user stop pulseaudio
 initctl --user start pulseaudio
 echo "Restarting Pulseaudio service"
 initctl --user stop pulseaudio
 initctl --user start pulseaudio