MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update scripts

Browse Source
This commit is contained in:
topjohnwu 2018-07-05 17:29:13 +08:00
parent ef175e3cbe
commit c3a6179a21
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/addon.d.sh
View File

@ -124,7 +124,7 @@ case "$1" in
# addon.d-v2 # addon.d-v2
main_v2 main_v2
else else
OUTFD=1 OUTFD=
get_outfd get_outfd
# Run in background, hack for addon.d-v1 # Run in background, hack for addon.d-v1
(main_v1) & (main_v1) &

4
scripts/util_functions.sh
View File

@ -23,7 +23,7 @@ BOOTSIGNER="/system/bin/dalvikvm -Xnodex2oat -Xnoimage-dex2oat -cp \$APK com.top
BOOTSIGNED=false BOOTSIGNED=false
get_outfd() { get_outfd() {
if [ $OUTFD -eq 1 ]; then if [ -z $OUTFD ] || readlink /proc/self/fd/$OUTFD | grep -q /tmp; then
# We will have to manually find out OUTFD # We will have to manually find out OUTFD
for FD in `ls /proc/self/fd`; do for FD in `ls /proc/self/fd`; do
if readlink /proc/self/fd/$FD | grep -q pipe; then if readlink /proc/self/fd/$FD | grep -q pipe; then
@ -162,11 +162,9 @@ run_migrations() {
fi fi
# Move the stock backups # Move the stock backups
if [ -f /data/magisk/stock_boot* ]; then if [ -f /data/magisk/stock_boot* ]; then
rm -rf /data/stock_boot*
mv /data/magisk/stock_boot* /data 2>/dev/null mv /data/magisk/stock_boot* /data 2>/dev/null
fi fi
if [ -f /data/adb/magisk/stock_boot* ]; then if [ -f /data/adb/magisk/stock_boot* ]; then
rm -rf /data/stock_boot*
mv /data/adb/magisk/stock_boot* /data 2>/dev/null mv /data/adb/magisk/stock_boot* /data 2>/dev/null
fi fi
# Remove old dbs # Remove old dbs