Display and control your Android device
Extract args processing in deps scripts
Romain Vimont6a81fc438b64
diff --git a/app/deps/adb.sh b/app/deps/adb.shindex b07f29b3..25727535 100755--- a/app/deps/adb.sh+++ b/app/deps/adb.sh@@ -3,6 +3,7 @@ set -exDEPS_DIR=$(dirname ${BASH_SOURCE[0]})cd "$DEPS_DIR". common+process_args "$@"VERSION=35.0.2FILENAME=platform-tools_r$VERSION-win.zipdiff --git a/app/deps/common b/app/deps/commonindex c1cc7729..6f8f80dc 100644--- a/app/deps/common+++ b/app/deps/common@@ -1,25 +1,27 @@#!/usr/bin/env bash# This file is intended to be sourced by other scripts, not executed-if [[ $# != 1 ]]-then- # <host>: win32 or win64- echo "Syntax: $0 <host>" >&2- exit 1-fi--HOST="$1"--if [[ "$HOST" = win32 ]]-then- HOST_TRIPLET=i686-w64-mingw32-elif [[ "$HOST" = win64 ]]-then- HOST_TRIPLET=x86_64-w64-mingw32-else- echo "Unsupported host: $HOST" >&2- exit 1-fi+process_args() {+ if [[ $# != 1 ]]+ then+ # <host>: win32 or win64+ echo "Syntax: $0 <host>" >&2+ exit 1+ fi++ HOST="$1"++ if [[ "$HOST" = win32 ]]+ then+ HOST_TRIPLET=i686-w64-mingw32+ elif [[ "$HOST" = win64 ]]+ then+ HOST_TRIPLET=x86_64-w64-mingw32+ else+ echo "Unsupported host: $HOST" >&2+ exit 1+ fi+}DEPS_DIR=$(dirname ${BASH_SOURCE[0]})cd "$DEPS_DIR"diff --git a/app/deps/ffmpeg.sh b/app/deps/ffmpeg.shindex 94fb06d2..20e59375 100755--- a/app/deps/ffmpeg.sh+++ b/app/deps/ffmpeg.sh@@ -3,6 +3,7 @@ set -exDEPS_DIR=$(dirname ${BASH_SOURCE[0]})cd "$DEPS_DIR". common+process_args "$@"VERSION=7.1FILENAME=ffmpeg-$VERSION.tar.xzdiff --git a/app/deps/libusb.sh b/app/deps/libusb.shindex 77a904b2..ee36d141 100755--- a/app/deps/libusb.sh+++ b/app/deps/libusb.sh@@ -3,6 +3,7 @@ set -exDEPS_DIR=$(dirname ${BASH_SOURCE[0]})cd "$DEPS_DIR". common+process_args "$@"VERSION=1.0.27FILENAME=libusb-$VERSION.tar.gzdiff --git a/app/deps/sdl.sh b/app/deps/sdl.shindex 1bdd9a4b..d8d0d734 100755--- a/app/deps/sdl.sh+++ b/app/deps/sdl.sh@@ -3,6 +3,7 @@ set -exDEPS_DIR=$(dirname ${BASH_SOURCE[0]})cd "$DEPS_DIR". common+process_args "$@"VERSION=2.30.9FILENAME=SDL-$VERSION.tar.gz