Skip to content

Commit

Permalink
scripts: hide expected x86 busybox error on arm
Browse files Browse the repository at this point in the history
- Magisk Manager installs have busybox in the $PATH before extracting busybox from update-binary so an error from busybox ash (as sh) attempting to parse the x86 busybox like a shell script would be shown:
./bin/busybox: line 1: syntax error: unexpected "("
- this will only occur when ash tries to run a binary it can't handle, so basically only with x86 binary on an arm* device
  • Loading branch information
osm0sis authored and topjohnwu committed Aug 31, 2019
1 parent 8d87eae commit dca3fe3
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion scripts/update_binary.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ extract_bb() {
touch "$BBBIN"
chmod 755 "$BBBIN"
dd if="$0" of="$BBBIN" bs=1024 skip=1 count=$X86_CNT
"$BBBIN" >/dev/null || dd if="$0" of="$BBBIN" bs=1024 skip=$(($X86_CNT + 1))
"$BBBIN" >/dev/null 2>&1 || dd if="$0" of="$BBBIN" bs=1024 skip=$(($X86_CNT + 1))
}
setup_bb() {
export BBDIR=$TMPDIR/bin
Expand Down

0 comments on commit dca3fe3

Please sign in to comment.