Compare commits

...

3 Commits

Author SHA1 Message Date
b789b9aef8 standardized messages 2022-11-09 20:36:00 -03:00
f1f33ae197 added adb serial found check 2022-11-09 20:35:20 -03:00
c9e2104e30 dockerfile: remove -q option 2022-11-09 20:33:48 -03:00
2 changed files with 8 additions and 5 deletions

View File

@ -4,7 +4,7 @@ RUN apt-get update
RUN apt-get install -y \
android-tools-adb \
android-tools-fastboot
RUN pip3 install protobuf -q
RUN pip3 install protobuf
COPY . /magisk
WORKDIR /magisk
CMD bash reinstall-magisk-on-lineageos

View File

@ -5,6 +5,10 @@ set -e
PHONE_ADB_SERIAL_NUMBER=${ADB_DEVICE} # The adb serial number can be found by running `adb devices`.
if [$PHONE_ADB_SERIAL_NUMBER = '']; then
PHONE_ADB_SERIAL_NUMBER=$(echo $(adb devices) | sed -rn 's/(^|(.* ))([^ ]*) device(( .*)|$)/\3/; T; p; q')
if [[ -n $PHONE_ADB_SERIAL_NUMBER ]]
print_message "ERROR: no suitable phone connected"
exit 1
fi
fi
print_message() {
@ -154,15 +158,14 @@ check_magisk_app() {
magisk_package_name_count=$(adb -s "$PHONE_ADB_SERIAL_NUMBER" shell pm list packages "$magisk_package_name" | wc -l)
if [ "${magisk_package_name_count}" -eq 1 ]
then
print_message " [OK] Magisk app seems to be installed on selected phone"
print_message "Magisk app seems to be installed on selected phone"
elif [ "${magisk_package_name_count}" -eq 0 ]
then
print_message " [ERROR] Magisk app seems not installed on selected phone. Exiting."
print_message "ERROR: Magisk app seems not installed on selected phone."
exit -1
else
print_message " [ERROR] More than one Magisk app entry is present:"
print_message "ERROR: More than one Magisk app entry is present:"
adb -s "$PHONE_ADB_SERIAL_NUMBER" shell pm list packages "$magisk_package_name"
print_message "Exiting."
exit -1
fi
}