Skip to content
This repository was archived by the owner on Jan 5, 2022. It is now read-only.

Commit 97dd229

Browse files
committed
adb pull progressbar fix
`adb pull` with v1.0.36 (r24/Android 7) now displays a progress bar. Good for interactive processing -- but broke our "screen logging". Fixed that.
1 parent 323625e commit 97dd229

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

lib/pull_config.lib

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ getSettings() {
1818
local msg
1919
# build.prop
2020
msg="$((adb ${ADBOPTS} pull /system/build.prop "${BUILDPROP}") 2>&1)"
21-
doProgress "- build.prop: $msg" 2
21+
doProgress "- build.prop: $(trim "${msg##*]}")" 2
2222

2323
# wpa_supplicant.conf
2424
if [[ ${ROOT_COMPAT} -eq 1 ]]; then
@@ -42,9 +42,9 @@ getSettings() {
4242

4343
# gps.conf, hosts
4444
msg="$((adb ${ADBOPTS} pull /system/etc/gps.conf "${CONFDIR}/gps.conf") 2>&1)"
45-
doProgress "- gps.conf: $msg" 2
45+
doProgress "- gps.conf: $(trim "${msg##*]}")" 2
4646
msg="$((adb ${ADBOPTS} pull /system/etc/hosts "${CONFDIR}/hosts") 2>&1)"
47-
doProgress "- hosts: $msg" 2
47+
doProgress "- hosts: $(trim "${msg##*]}")" 2
4848

4949
# packages.xml
5050
if [[ ${ROOT_COMPAT} -eq 1 ]]; then

0 commit comments

Comments
 (0)