diff --git a/project/jni/application/xserver-debian/AndroidAppSettings.cfg b/project/jni/application/xserver-debian/AndroidAppSettings.cfg index bcc1c395b..61bf4c2b5 100644 --- a/project/jni/application/xserver-debian/AndroidAppSettings.cfg +++ b/project/jni/application/xserver-debian/AndroidAppSettings.cfg @@ -298,7 +298,7 @@ AppSubdirsBuild='' AppBuildExclude='' # Application command line parameters, including app name as 0-th param -AppCmdline='XSDL -nohelp -screenbuttons -warndiskspacemb 900 -exec $SECURE_STORAGE_DIR/usr/bin/xli -onroot -border black -center $UNSECURE_STORAGE_DIR/loading.gif ; $SECURE_STORAGE_DIR/img/proot.sh ./startx.sh' +AppCmdline='XSDL -nohelp -screenbuttons -warndiskspacemb 900 -exec $SECURE_STORAGE_DIR/usr/bin/xloadimage -onroot -fullscreen $UNSECURE_STORAGE_DIR/loading.gif ; $SECURE_STORAGE_DIR/img/proot.sh ./startx.sh' # Screen size is used by Google Play to prevent an app to be installed on devices with smaller screens # Minimum screen size that application supports: (s)mall / (m)edium / (l)arge diff --git a/project/jni/application/xserver-debian/AndroidData/postinstall.sh b/project/jni/application/xserver-debian/AndroidData/postinstall.sh index 3abc22c2d..ed12df777 100755 --- a/project/jni/application/xserver-debian/AndroidData/postinstall.sh +++ b/project/jni/application/xserver-debian/AndroidData/postinstall.sh @@ -5,9 +5,11 @@ OBB_VERSION=$ANDROID_PACKAGE_VERSION_CODE echo "Extracting data files" cd $SECURE_STORAGE_DIR -./busybox tar xvJf $ANDROID_OBB_DIR/main.$OBB_VERSION.$ANDROID_PACKAGE_NAME.obb +echo "./busybox tar xvJf $ANDROID_OBB_DIR/main.$OBB_VERSION.$ANDROID_PACKAGE_NAME.obb" +./busybox tar xvJf $ANDROID_OBB_DIR/main.$OBB_VERSION.$ANDROID_PACKAGE_NAME.obb || { echo "Extracting data failed!" ; exit 1 ; } echo "Extracting overlay data files" -./busybox tar xvJf $DATADIR/overlay.tar.xz +echo "./busybox tar xvJf $DATADIR/overlay.tar.xz" +./busybox tar xvJf $DATADIR/overlay.tar.xz || { echo "Extracting overlay data failed!" ; exit 1 ; } cd $SECURE_STORAGE_DIR/img echo "Installation path: $SECURE_STORAGE_DIR/img" @@ -16,7 +18,7 @@ rm -f ./postinstall-img.sh ./proot.sh ln -s ../usr/bin/postinstall-img.sh . ln -s ../usr/bin/proot.sh . -ls -l . +# ls -l . echo "Running postinstall-img.sh:" diff --git a/project/jni/application/xserver-debian/debian-image b/project/jni/application/xserver-debian/debian-image index 036ec696c..c4a0dddd0 160000 --- a/project/jni/application/xserver-debian/debian-image +++ b/project/jni/application/xserver-debian/debian-image @@ -1 +1 @@ -Subproject commit 036ec696c62e4bba2f9a78f647ca56dade67dd8d +Subproject commit c4a0dddd033f0720f20ec6dba93accf3bdee7360 diff --git a/project/jni/application/xserver/gfx.c b/project/jni/application/xserver/gfx.c index 94072bde0..892554cb2 100644 --- a/project/jni/application/xserver/gfx.c +++ b/project/jni/application/xserver/gfx.c @@ -364,7 +364,7 @@ void XSDL_unpackFiles(int _freeSpaceRequiredMb) renderString(unpackLog[3], VID_X/2, VID_Y*5/8); progress++; renderString(progressWheel[progress % PROGRESS_WHEEL_NUM], VID_X/2, VID_Y*6/8); - renderString("You may put this app to background while it's unpacking", VID_X/2, VID_Y*7/8); + renderString("Unpacking data ...", VID_X/2, VID_Y*7/8); SDL_Flip(SDL_GetVideoSurface()); int x = 0, y = 0; while( upgradeWarning == UPGRADE_WARNING_ASK )