mvietri/union-minui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

the update itself now finishes the update/install

Browse source
This commit is contained in:
Shaun Inman 2023-02-06 21:11:53 -05:00
parent faeff1759c
commit b5e2f706f1
3 changed files with 55 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/boot/boot.sh
View file

@ -52,54 +52,12 @@ if [ -f $UPDATE_PATH ]; then
dd if=/tmp/$ACTION of=/dev/fb0
sync
# TODO: move this logic into MinUI.zip contents?
busybox unzip -o $UPDATE_PATH -d $SDCARD_PATH
rm -f $UPDATE_PATH
if [ ! -f $FLAG_PATH ]; then
BAK_PATH=$TF1_PATH/bak
mkdir -p $BAK_PATH
cp /misc/modules/gpio_keys_polled.ko $BAK_PATH
cp /misc/boot_logo.bmp.gz $BAK_PATH
cp /misc/kernel.dtb $BAK_PATH
cp /misc/uImage $BAK_PATH
fi
was_updated() {
for FILE in /misc/* /misc/*/*; do
A_PATH=$FILE
B_PATH=$SYSTEM_PATH/dat/$(busybox basename "$A_PATH")
if [ ! -f "$B_PATH" ]; then
continue
fi
A_SUM=$(busybox md5sum $A_PATH | busybox cut -d ' ' -f 1)
B_SUM=$(busybox md5sum $B_PATH | busybox cut -d ' ' -f 1)
if [[ "$A_SUM" != "$B_SUM" ]]; then
return 0
fi
done
return 1
}
# the updated system finishes the install/update
$SYSTEM_PATH/bin/install.sh
if [ ! -f $FLAG_PATH ] || was_updated; then
echo "updating misc partition"
mount -o remount,rw /dev/block/actb /misc
rm -f /misc/uImage
cp $SYSTEM_PATH/dat/uImage /misc
cp $SYSTEM_PATH/dat/dmenu.bin /misc
if [ ! -f $FLAG_PATH ]; then
# only replace boot logo on install not update
cp $SYSTEM_PATH/dat/boot_logo.bmp.gz /misc
fi
cp $SYSTEM_PATH/dat/kernel.dtb /misc
cp $SYSTEM_PATH/dat/gpio_keys_polled.ko /misc/modules
touch $FLAG_PATH
sync && reboot
fi
} &> /mnt/sdcard/install.txt
fi

52
src/install/install.sh Executable file
View file

@ -0,0 +1,52 @@
#!/system/bin/sh
# NOTE: this file is not chrooted so it's using stock's everything!
TF1_PATH=/mnt/mmc
TF2_PATH=/mnt/sdcard # TF1 is linked to this path if TF2 is missing
SYSTEM_PATH=/mnt/sdcard/.system/rg35xx
if [ ! -f $FLAG_PATH ]; then
BAK_PATH=$TF1_PATH/bak
mkdir -p $BAK_PATH
cp /misc/modules/gpio_keys_polled.ko $BAK_PATH
cp /misc/boot_logo.bmp.gz $BAK_PATH
cp /misc/kernel.dtb $BAK_PATH
cp /misc/uImage $BAK_PATH
fi
was_updated() {
for FILE in /misc/* /misc/*/*; do
A_PATH=$FILE
B_PATH=$SYSTEM_PATH/dat/$(busybox basename "$A_PATH")
if [ ! -f "$B_PATH" ]; then
continue
fi
A_SUM=$(busybox md5sum $A_PATH | busybox cut -d ' ' -f 1)
B_SUM=$(busybox md5sum $B_PATH | busybox cut -d ' ' -f 1)
if [[ "$A_SUM" != "$B_SUM" ]]; then
return 0
fi
done
return 1
}
if [ ! -f $FLAG_PATH ] || was_updated; then
echo "updating misc partition"
mount -o remount,rw /dev/block/actb /misc
rm -f /misc/uImage
cp $SYSTEM_PATH/dat/uImage /misc
cp $SYSTEM_PATH/dat/dmenu.bin /misc
if [ ! -f $FLAG_PATH ]; then
# only replace boot logo on install not update!
cp $SYSTEM_PATH/dat/boot_logo.bmp.gz /misc
fi
cp $SYSTEM_PATH/dat/kernel.dtb /misc
cp $SYSTEM_PATH/dat/gpio_keys_polled.ko /misc/modules
touch $FLAG_PATH
sync && reboot
fi