more confs

[waydroid.git] / scripts / install.sh

diff --git a/scripts/install.sh b/scripts/install.sh
index 82ff4a2a94c1406f3a452319be79a8a958ca2a2c..ae541b7d55b80b7030b1a06c924c59ef66a4e2d9 100644 (file)
--- 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"
 . generate-props.sh
 
 echo "Asking for root access"

-sudo -s <<EOF
+sudo bash <<EOF

 mount -o remount,rw /
 
 mkdir /home/anbox
 mount -o remount,rw /
 
 mkdir /home/anbox


@@ -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
 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
 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
 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
        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
 
 # TODO: Get rid of this
 rm -f vendor-fixup.sh