X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/waydroid.git/blobdiff_plain/ead0f6940830256ecbccaddff182bb5e1c318324..refs/heads/lineage-17.1:/scripts/install.sh

diff --git a/scripts/install.sh b/scripts/install.sh
index f7fa981..ae541b7 100644
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -35,7 +35,7 @@ chmod +x generate-props.sh
 . generate-props.sh
 
 echo "Asking for root access"
-sudo -s <<EOF
+sudo bash <<EOF
 mount -o remount,rw /
 
 mkdir /home/anbox
@@ -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 lxc
 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
@@ -83,15 +83,15 @@ if [ -f anbox.prop ]; then
 fi
 if grep -q "anbox.display_height" anbox.prop.bak; then
     grep "anbox.display_height" anbox.prop.bak >> anbox.prop
-else
-    echo "NOTE: Edit /home/anbox/anbox.prop based on your device screen resolution"
-    echo "anbox.display_height=1920" >> anbox.prop
 fi
 if grep -q "anbox.display_width" anbox.prop.bak; then
     grep "anbox.display_width" anbox.prop.bak >> anbox.prop
-else
-    echo "NOTE: Edit /home/anbox/anbox.prop based on your device screen resolution"
-    echo "anbox.display_width=1080" >> anbox.prop
+fi
+if grep -q "anbox.display_height_padding" anbox.prop.bak; then
+    grep "anbox.display_height_padding" anbox.prop.bak >> anbox.prop
+fi
+if grep -q "anbox.display_width_padding" anbox.prop.bak; then
+    grep "anbox.display_width_padding" anbox.prop.bak >> anbox.prop
 fi
 echo "${GRALLOC_PROP}" >> anbox.prop
 echo "${EGL_PROP}" >> anbox.prop
@@ -108,6 +108,8 @@ if [ -f NO_SENSORS ]; then
 	echo "anbox.stub_sensors_hal=1" >> anbox.prop
 	rm NO_SENSORS
 fi
+# TODO: Drop this
+echo "anbox.active_apps=full" >> anbox.prop
 
 # TODO: Get rid of this
 rm -f vendor-fixup.sh
@@ -118,9 +120,18 @@ 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 [ ! -e /dev/hwbinder ]; then
+        sed -i "/host_hwbinder/d" config_nodes
+fi
 
 if ! grep -q "module-native-protocol-unix auth-anonymous=1" /etc/pulse/touch-android9.pa; then
     echo "Pulseaudio config patching"
@@ -140,11 +151,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