anbox: Add display related repos to local_manifest

[waydroid.git] / scripts / install.sh

diff --git a/scripts/install.sh b/scripts/install.sh
index f7fa9815c0de2a58c70fa7d0ca97426c1647f0cf..330dfdbf530ff821903e9bf29e6349e3b32dddea 100644 (file)
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -48,7 +48,7 @@ fi
 
 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
@@ -118,9 +118,15 @@ chmod +x vendor-fixup.sh
 echo "Geting latest lxc config"
 mkdir /var/lib/lxc/anbox
 cd /var/lib/lxc/anbox
-rm -f config
-wget https://github.com/Anbox-halium/anbox-halium/raw/lineage-17.1/lxc-configs/config
+rm -f config*
+if [ `lxc-info --version | cut -d "." -f 1` -gt 2 ]; then
+    wget https://github.com/Anbox-halium/anbox-halium/raw/lineage-17.1/lxc-configs/config_2
+else
+    wget https://github.com/Anbox-halium/anbox-halium/raw/lineage-17.1/lxc-configs/config_1
+fi
+mv config_* config
 sed -i "s/LXCARCH/$UNAME_ARCH/" config
+wget https://github.com/Anbox-halium/anbox-halium/raw/lineage-17.1/lxc-configs/config_nodes
 
 if ! grep -q "module-native-protocol-unix auth-anonymous=1" /etc/pulse/touch-android9.pa; then
     echo "Pulseaudio config patching"
@@ -140,11 +146,6 @@ echo "Going back to phablet user"
 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