Archives/NanoDroid
2
0
Fork 0
mirror of https://gitlab.com/Nanolx/NanoDroid synced 2024-11-02 03:40:13 +00:00
Code Issues Projects Releases Wiki Activity

remove duplicated '!!' in error messages

Browse Source
This commit is contained in:
Christopher Roy Bratusek 2018-09-08 19:34:25 +02:00
parent bca5c2c320
commit 26d3271ef5
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
patcher/META-INF/com/google/android/update-binary
View File

@ -35,11 +35,11 @@ mount_partitions
if [ -f /data/adb/.nanodroid-patcher ]; then
ui_print " !! /data/adb/.nanodroid-patcher exists"
ui_print " !! if you want to force patching, then"
error " !! remove this file and try again"
error " remove this file and try again"
elif [ -f /data/adb/NanoDroid_Patched ]; then
ui_print " !! /data/adb/NanoDroid_Patched exists"
ui_print " !! if you want to force patching, then"
error " !! remove this file and try again"
error " remove this file and try again"
fi
setup_patcher

16
uninstaller/META-INF/com/google/android/update-binary
View File

@ -106,11 +106,9 @@ setup_busybox () {
}
error () {
ui_print "${@}"
ui_print " "
ui_print " ** post your /tmp/recovery.log"
ui_print " ** in the XDA support thread"
ui_print " "
ui_print " !!"
ui_print " !! ${@}"
ui_print " !!"
exit 1
}
@ -212,7 +210,7 @@ restore_gapps () {
else
ui_print " << restoring: ${appdir} / ${app}"
mv /sdcard/nanodroid_backups/${appdir}/${app} \
/system/${appdir}/ || error " !! failed to restore ${app}"
/system/${appdir}/ || error " failed to restore ${app}"
fi
done
}
@ -248,7 +246,7 @@ patcher_uninstall () {
if [ -f /sdcard/nanodroid_backups/services.jar ]; then
ui_print " << restoring: unpatched services.jar"
mv /sdcard/nanodroid_backups/services.jar /system/framework/services.jar \
|| error " !! failed to restore services.jar"
|| error " failed to restore services.jar"
else ui_print " << can't restore unpatched services.jar"
fi
fi
@ -309,7 +307,7 @@ patcher_uninstall
if [ -f /data/adb/magisk.img ]; then
mkdir -p /magisk
mount_image /data/adb/magisk.img /magisk || \
error " !! failed to mount /magisk"
error " failed to mount /magisk"
fi
if (is_mounted /magisk); then
@ -328,7 +326,7 @@ if (is_mounted /magisk); then
losetup -d $LOOPDEVICE
rmdir /magisk
shrink_magisk_img || \
error " !! failed to shrink magisk.img"
error " failed to shrink magisk.img"
fi
umount /system