From 56d87e115c203a9552e7e5bd8afb4da090dbe5b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Garc=C3=ADa-Dom=C3=ADnguez?= Date: Tue, 11 Sep 2018 19:11:13 +0100 Subject: Check if PORT is taken: if so, show message and fall back to Wi-Fi (fixes #54) --- prepare-videochat.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'prepare-videochat.sh') diff --git a/prepare-videochat.sh b/prepare-videochat.sh index ee0cc81..8e5f91d 100755 --- a/prepare-videochat.sh +++ b/prepare-videochat.sh @@ -449,8 +449,12 @@ else sleep 1; done if phone_plugged; then - "$ADB" $ADB_FLAGS forward tcp:$PORT tcp:$PORT - IP=127.0.0.1 + if ss -ln src :$PORT | grep -q :$PORT; then + warning "Your port $PORT seems to be in use: falling back to Wi-Fi. If you would like to use USB forwarding, please free it up and try again." + else + "$ADB" $ADB_FLAGS forward tcp:$PORT tcp:$PORT + IP=127.0.0.1 + fi fi fi -- cgit v1.2.3