From 0824c53e7880db0cd0a91c9d158f20117ca33c21 Mon Sep 17 00:00:00 2001 From: alexia Date: Tue, 29 Nov 2022 14:02:40 +0100 Subject: [PATCH] improve dfuhelper (#274) * dfuhelper: erase lines properly * dfuhelper: simplify step function * dfuhelper: exit as soon as DFU is detected * dfuhelper: get rid of keep holding step wait for the previous step to finish instead --- palera1n.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/palera1n.sh b/palera1n.sh index 5f3db58..a1532f0 100755 --- a/palera1n.sh +++ b/palera1n.sh @@ -31,11 +31,14 @@ remote_cp() { } step() { - for i in $(seq "$1" -1 1); do - printf '\r\e[1;36m%s (%d) ' "$2" "$i" + for i in $(seq "$1" -1 0); do + if [ "$(get_device_mode)" = "dfu" ]; then + break + fi + printf '\r\e[K\e[1;36m%s (%d)' "$2" "$i" sleep 1 done - printf '\r\e[0m%s (0)\n' "$2" + printf '\e[0m\n' } print_help() { @@ -262,7 +265,7 @@ _dfuhelper() { step 4 "$step_one" & sleep 3 "$dir"/irecovery -c "reset" - step 1 "Keep holding" + wait if [[ "$1" = 0x801* && "$deviceid" != *"iPad"* ]]; then step 10 'Release side button, but keep holding volume down' else