Skip to content

Display and control your Android device

Extract $VERSION for dependency scripts

Romain Vimont825d7f72c0a8
diff --git a/app/prebuilt-deps/prepare-libusb.sh b/app/prebuilt-deps/prepare-libusb.sh
index 6a052f0d..228a5bfa 100755
--- a/app/prebuilt-deps/prepare-libusb.sh
+++ b/app/prebuilt-deps/prepare-libusb.sh
@@ -6,9 +6,10 @@ cd "$DIR"
mkdir -p "$PREBUILT_DATA_DIR"
cd "$PREBUILT_DATA_DIR"
-DEP_DIR=libusb-1.0.26
+VERSION=1.0.26
+DEP_DIR="libusb-$VERSION"
-FILENAME=libusb-1.0.26-binaries.7z
+FILENAME="libusb-$VERSION-binaries.7z"
SHA256SUM=9c242696342dbde9cdc47239391f71833939bf9f7aa2bbb28cdaabe890465ec5
if [[ -d "$DEP_DIR" ]]
@@ -17,20 +18,21 @@ then
exit 0
fi
-get_file "https://github.com/libusb/libusb/releases/download/v1.0.26/$FILENAME" "$FILENAME" "$SHA256SUM"
+get_file "https://github.com/libusb/libusb/releases/download/v$VERSION/$FILENAME" \
+ "$FILENAME" "$SHA256SUM"
mkdir "$DEP_DIR"
cd "$DEP_DIR"
7z x "../$FILENAME" \
- libusb-1.0.26-binaries/libusb-MinGW-Win32/ \
- libusb-1.0.26-binaries/libusb-MinGW-Win32/ \
- libusb-1.0.26-binaries/libusb-MinGW-x64/ \
- libusb-1.0.26-binaries/libusb-MinGW-x64/
-
-mv libusb-1.0.26-binaries/libusb-MinGW-Win32 .
-mv libusb-1.0.26-binaries/libusb-MinGW-x64 .
-rm -rf libusb-1.0.26-binaries
+ "libusb-$VERSION-binaries/libusb-MinGW-Win32/" \
+ "libusb-$VERSION-binaries/libusb-MinGW-Win32/" \
+ "libusb-$VERSION-binaries/libusb-MinGW-x64/" \
+ "libusb-$VERSION-binaries/libusb-MinGW-x64/"
+
+mv "libusb-$VERSION-binaries/libusb-MinGW-Win32" .
+mv "libusb-$VERSION-binaries/libusb-MinGW-x64" .
+rm -rf "libusb-$VERSION-binaries"
# Rename the dll to get the same library name on all platforms
mv libusb-MinGW-Win32/bin/msys-usb-1.0.dll libusb-MinGW-Win32/bin/libusb-1.0.dll
diff --git a/app/prebuilt-deps/prepare-sdl.sh b/app/prebuilt-deps/prepare-sdl.sh
index f53f090c..580461d2 100755
--- a/app/prebuilt-deps/prepare-sdl.sh
+++ b/app/prebuilt-deps/prepare-sdl.sh
@@ -6,9 +6,10 @@ cd "$DIR"
mkdir -p "$PREBUILT_DATA_DIR"
cd "$PREBUILT_DATA_DIR"
-DEP_DIR=SDL2-2.28.4
+VERSION=2.28.4
+DEP_DIR="SDL2-$VERSION"
-FILENAME=SDL2-devel-2.28.4-mingw.tar.gz
+FILENAME="SDL2-devel-$VERSION-mingw.tar.gz"
SHA256SUM=779d091072cf97291f80030f5232d97aa3d48ab0f2c14fe0b9d9a33c593cdc35
if [[ -d "$DEP_DIR" ]]
@@ -17,7 +18,8 @@ then
exit 0
fi
-get_file "https://github.com/libsdl-org/SDL/releases/download/release-2.28.4/$FILENAME" "$FILENAME" "$SHA256SUM"
+get_file "https://github.com/libsdl-org/SDL/releases/download/release-$VERSION/$FILENAME" \
+ "$FILENAME" "$SHA256SUM"
mkdir "$DEP_DIR"
cd "$DEP_DIR"