Skip to content

Commit b807c04

Browse files
Changed(termux-usb): Update error handling as per new messages in termux/termux-api@15d5fb62
1 parent 2b7fe08 commit b807c04

1 file changed

Lines changed: 20 additions & 11 deletions

File tree

scripts/termux-usb.in

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -53,17 +53,26 @@ fi
5353

5454
CMD="@TERMUX_PREFIX@/libexec/termux-api Usb -a $ACTION $PARAMS"
5555

56-
if [ "$ACTION" == "permission" ]
57-
then
58-
if [ "$($CMD)" == "yes" ]
59-
then
60-
echo "Access granted."
61-
exit 0
62-
else
63-
echo "Access denied."
64-
exit 1
65-
fi
66-
else
56+
if [[ "$ACTION" == "list" ]]; then
6757
$CMD
58+
elif [[ "$ACTION" == "permission" ]]; then
59+
OUTPUT="$($CMD)"
60+
case "$OUTPUT" in
61+
"No such device"|"No such device.") echo "No such device."; exit 1;;
62+
"yes") echo "Permission granted."; exit 0;;
63+
"no"|"Permission denied.") echo "Permission denied."; exit 1;;
64+
"Permission request timeout.") echo "Permission request timeout."; exit 1;;
65+
*) printf "%s\n" "$OUTPUT"; exit 0;;
66+
esac
67+
elif [[ "$ACTION" == "open" ]]; then
68+
OUTPUT="$($CMD)"
69+
case "$OUTPUT" in
70+
"No such device"|"No such device.") echo "No such device."; exit 1;;
71+
"No permission"|"Permission denied.") echo "Permission denied."; exit 1;;
72+
"Permission request timeout.") echo "Permission request timeout."; exit 1;;
73+
"Failed to open device"|"Open device failed.") echo "Open device failed."; exit 1;;
74+
*) printf "%s\n" "$OUTPUT"; exit 0;;
75+
esac
6876
fi
6977

78+
exit 0

0 commit comments

Comments
 (0)