miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Debian: updated postinstall script

Browse Source
This commit is contained in:
Sergii Pylypenko
2019-12-31 20:36:29 +02:00
parent ae4e375c8e
commit 1aaf5fecb8
5 changed files with 19 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
project/jni/application/xserver-debian/AndroidAppSettings.cfg
View File

@@ -20,7 +20,7 @@ AppVersionName="19.12.24"
# You can specify Google Play expansion files in the form 'obb:main.12345' or 'obb:patch.12345' where 12345 is the app version for obb file
# You can use .zip.xz archives for better compression, but you need to add 'lzma' to CompiledLibraries
# Generate .zip.xz files like this: zip -0 -r data.zip your-data/* ; xz -8 data.zip
AppDataDownloadUrl="!!Library mapping|bin-map.zip^!!Data files|:data.tar.gz:data-2.tgz^!!Data files|:DroidSansMono.ttf:DroidSansMono.ttf^!!Postinstall script|:postinstall.sh:postinstall.sh^!!Loading image|:loading.gif:loading.gif^!!System overlay|:overlay.tar.xz:overlay-<ARCH>.tar.xz"
AppDataDownloadUrl="!!Library mapping|bin-map.zip^!!Data files|:data.tar.gz:data-2.tgz^!!Data files|:DroidSansMono.ttf:DroidSansMono.ttf^!!Loading image|:loading.gif:loading.gif^!!System overlay|:overlay.tar.xz:overlay-<ARCH>.tar.xz"
# Reset SDL config when updating application to the new version (y) / (n)
ResetSdlConfigForThisVersion=y

12
project/jni/application/xserver-debian/AndroidData/postinstall.sh
View File

@@ -9,5 +9,15 @@ cd $SECURE_STORAGE_DIR
echo "Extracting overlay data files"
./busybox tar xvJf $DATADIR/overlay.tar.xz
cd $SECURE_STORAGE_DIR/img
echo "Installation path: $SECURE_STORAGE_DIR/img"
./postinstall.sh
rm -f ./postinstall-img.sh ./proot.sh
ln -s ../usr/bin/postinstall-img.sh .
ln -s ../usr/bin/proot.sh .
ls -l .
echo "Running postinstall-img.sh:"
./postinstall-img.sh

2
project/jni/application/xserver-debian/debian-image

Submodule project/jni/application/xserver-debian/debian-image updated: 542f8256ae...036ec696c6

3
project/jni/application/xserver/AndroidBuild.sh
View File

@@ -85,6 +85,9 @@ cp -f $CURDIR/pulseaudio/$1/install/lib/pulseaudio/*.so ./
cp -f $CURDIR/pulseaudio/$1/install/lib/pulse-*/modules/*.so ./
cp -f $CURDIR/pulseaudio/$1/*/install/lib/*.so ./
cp -f $CURDIR/debian-image/proot-prebuilt/$1/* ./
cp -f $CURDIR/debian-image/dist/proot.sh ./
cp -f $CURDIR/debian-image/dist/postinstall-img.sh ./
cp -f $CURDIR/AndroidData/postinstall.sh ./
rm -f ../AndroidData/binaries-$1.zip
rm -rf ../AndroidData/lib/$1

29
project/jni/application/xserver/gfx.c
View File

@@ -196,33 +196,10 @@ static int unpackFiles(const char *archive, const char *script, const char *dele
strcat( fname, script );
if( stat( fname, &st ) != 0 )
{
strcpy( fname2, getenv("UNSECURE_STORAGE_DIR") );
strcat( fname2, "/" );
strcat( fname2, script );
if( stat( fname2, &st ) != 0 )
{
__android_log_print(ANDROID_LOG_INFO, "XSDL", "Cannot find postinstall script");
return 1;
}
else
{
strcpy( fname2, "cat " );
strcat( fname2, getenv("UNSECURE_STORAGE_DIR") );
strcat( fname2, "/" );
strcat( fname2, script );
strcat( fname2, " > " );
strcat( fname2, fname );
__android_log_print(ANDROID_LOG_INFO, "XSDL", "Copying postinstall script from SD card: %s", fname2);
system( fname2 );
}
__android_log_print(ANDROID_LOG_INFO, "XSDL", "Cannot find postinstall script");
return 1;
}
__android_log_print(ANDROID_LOG_INFO, "XSDL", "Setting executable permissions on postinstall script");
strcpy( fname2, "chmod 755 " );
strcat( fname2, fname );
system( fname2 );
__android_log_print(ANDROID_LOG_INFO, "XSDL", "Running postinstall scipt: %s", script);
fo = popen(fname, "r");
@@ -254,7 +231,7 @@ static void * unpackFilesThread(void * unused)
{
const char *unpack[][4] =
{
{ "data.tar.gz", "postinstall.sh", "usr/lib/xorg/protocol.txt", "img img-* postinstall.sh update*.sh" },
{ "data.tar.gz", "usr/bin/postinstall.sh", "usr/lib/xorg/protocol.txt", "img img-* postinstall.sh update*.sh" },
{ "xfonts.tar.gz", "", "", "" },
{ "update1.tar.gz", "update1.sh", "", "" },
{ "update2.tar.gz", "update2.sh", "", "" },