From 8edb321123527e88e7313b3b69f83faa22164f5c Mon Sep 17 00:00:00 2001
From: Sergii Pylypenko <x.pelya.x@gmail.com>
Date: Mon, 10 Jan 2022 00:47:46 +0200
Subject: [PATCH] SuperTux: put a data archive inside the assetpack archive,
 there's no other way

---
 project/jni/application/supertux/.gitignore   |  1 +
 .../supertux/AndroidData/assetpack            |  1 -
 .../application/supertux/AndroidPreBuild.sh   | 11 ++++++++
 .../supertux/repack-bundle-data.sh            | 28 -------------------
 project/jni/application/supertux/supertux     |  2 +-
 5 files changed, 13 insertions(+), 30 deletions(-)
 delete mode 120000 project/jni/application/supertux/AndroidData/assetpack
 create mode 100755 project/jni/application/supertux/AndroidPreBuild.sh
 delete mode 100755 project/jni/application/supertux/repack-bundle-data.sh

diff --git a/project/jni/application/supertux/.gitignore b/project/jni/application/supertux/.gitignore
index f4f359665..1dffb81f6 100644
--- a/project/jni/application/supertux/.gitignore
+++ b/project/jni/application/supertux/.gitignore
@@ -1 +1,2 @@
 /data.zip
+/AndroidData/assetpack
diff --git a/project/jni/application/supertux/AndroidData/assetpack b/project/jni/application/supertux/AndroidData/assetpack
deleted file mode 120000
index 281472cc1..000000000
--- a/project/jni/application/supertux/AndroidData/assetpack
+++ /dev/null
@@ -1 +0,0 @@
-../supertux/data
\ No newline at end of file
diff --git a/project/jni/application/supertux/AndroidPreBuild.sh b/project/jni/application/supertux/AndroidPreBuild.sh
new file mode 100755
index 000000000..0a116f9aa
--- /dev/null
+++ b/project/jni/application/supertux/AndroidPreBuild.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+mkdir -p AndroidData/assetpack
+[ -e AndroidData/assetpack/data.zip ] && exit 0
+cd supertux/data || exit 1
+sed 's/@LOGO_FILE@/logo_final.sprite/g' levels/misc/menu.stl.in > levels/misc/menu.stl
+if [ -e $HOME/.local/share/supertux2/tilecache ]; then
+	mkdir -p tilecache
+	cp -f $HOME/.local/share/supertux2/tilecache/* tilecache/
+fi
+zip -r -9 ../../AndroidData/assetpack/data.zip .
diff --git a/project/jni/application/supertux/repack-bundle-data.sh b/project/jni/application/supertux/repack-bundle-data.sh
deleted file mode 100755
index c090f8ca1..000000000
--- a/project/jni/application/supertux/repack-bundle-data.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-# Set path to your Android keystore and your keystore alias here, or put them in your environment
-PASS=
-[ -n "$ANDROID_UPLOAD_KEYSTORE_PASS" ] && PASS="-storepass:env ANDROID_UPLOAD_KEYSTORE_PASS"
-[ -n "$ANDROID_UPLOAD_KEYSTORE_PASS_FILE" ] && PASS="-storepass:file $ANDROID_UPLOAD_KEYSTORE_PASS_FILE"
-
-cd ../../../../
-
-APPNAME=`grep AppName AndroidAppSettings.cfg | sed 's/.*=//' | tr -d '"' | tr " '/" '---'`
-APPVER=`grep AppVersionName AndroidAppSettings.cfg | sed 's/.*=//' | tr -d '"' | tr " '/" '---'`
-
-rm -rf supertux-tmp
-mkdir -p supertux-tmp
-cd supertux-tmp
-unzip ../$APPNAME-$APPVER.aab || exit 1
-rm -rf META-INF
-mv assetpack/assets/* assetpack/
-rm ../$APPNAME-$APPVER.aab
-zip -r ../$APPNAME-$APPVER.aab .
-cd ..
-rm -rf supertux-tmp
-# Sign with the new certificate
-echo Using keystore $ANDROID_UPLOAD_KEYSTORE_FILE and alias $ANDROID_UPLOAD_KEYSTORE_ALIAS
-stty -echo
-jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore $ANDROID_UPLOAD_KEYSTORE_FILE $PASS $APPNAME-$APPVER.aab $ANDROID_UPLOAD_KEYSTORE_ALIAS || exit 1
-stty echo
-echo
diff --git a/project/jni/application/supertux/supertux b/project/jni/application/supertux/supertux
index 837501c7f..aeb40404f 160000
--- a/project/jni/application/supertux/supertux
+++ b/project/jni/application/supertux/supertux
@@ -1 +1 @@
-Subproject commit 837501c7f341ef6b8a549ef58e5181f7f0403e89
+Subproject commit aeb40404f37cbf7829d778958202f77f3b351a2d