Skip to content

Commit 7a86f09

Browse files
authored
Android - script updates for download_libs (#8341)
* scripts android download libs * of script help for update platform * script version++
1 parent 5630d20 commit 7a86f09

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

scripts/android/download_libs.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/usr/bin/env bash
22
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
33
cd $SCRIPT_DIR
4-
../dev/download_libs.sh -p android $@
4+
../dev/download_libs.sh -p android -b $@

scripts/dev/download_libs.sh

+2-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ LEGACY=0
88
SILENT_ARGS=""
99
NO_SSL=""
1010
BLEEDING_EDGE=0
11-
DL_VERSION=2.6.4
11+
DL_VERSION=2.6.5
1212
TAG=""
1313

1414
printHelp(){
@@ -294,8 +294,7 @@ elif [ "$ARCH" == "" ] && [ "$PLATFORM" == "android" ]; then
294294
if [[ $BLEEDING_EDGE = 1 ]] ; then
295295
PKGS="openFrameworksLibs_${VER}_${PLATFORM}_armv7.tar.bz2 \
296296
openFrameworksLibs_${VER}_${PLATFORM}_arm64.tar.bz2 \
297-
openFrameworksLibs_${VER}_${PLATFORM}_x86_64.tar.bz2
298-
openFrameworksLibs_${VER}_${PLATFORM}_x86.tar.bz2"
297+
openFrameworksLibs_${VER}_${PLATFORM}_x86_64.tar.bz2"
299298
else
300299
PKGS="openFrameworksLibs_${VER}_${PLATFORM}armv7.tar.bz2 \
301300
openFrameworksLibs_${VER}_${PLATFORM}arm64.tar.bz2 \

scripts/of.sh

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
# pipe commands to core openFrameworks scripts
3-
OF_SCRIPT_VERSION=0.2.1
3+
OF_SCRIPT_VERSION=0.2.2
44
# Dan Rosser 2025
55
OF_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
66
OF_DIR="$(realpath "$OF_DIR/../")"
@@ -9,7 +9,7 @@ OF_CORE_CI_SCRIPT_DIR="$(realpath "$OF_DIR/scripts/ci")"
99
OF_PG_INSTALLED_DIR="$(realpath "$OF_DIR/projectGenerator")"
1010
VERBOSE=${VERBOSE:-0}
1111
echoVerbose() {
12-
if [[ -n "$VERBOSE" ]]; then
12+
if [[ "$VERBOSE" = 1 ]]; then
1313
echo "$@"
1414
fi
1515
}
@@ -75,6 +75,7 @@ Usage: $0 <command> [subcommand] [options]
7575
Commands:
7676
update [subcommand] Update openFrameworks components
7777
libs Download openFrameworks libraries (default)
78+
libs [platform] i.e update libs ios
7879
pg | projectgenerator Download Project Generator
7980
8081
version [subcommand] Show version information
@@ -126,7 +127,7 @@ runCommand() {
126127
SCRIPT="${OF_CORE_SCRIPT_DIR}/${PLATFORM_DIR}/download_projectGenerator.sh"
127128
;;
128129
*)
129-
SCRIPT="${OF_CORE_SCRIPT_DIR}/${PLATFORM_DIR}/download_libs.sh" ""
130+
SCRIPT="${OF_CORE_SCRIPT_DIR}/${PLATFORM_DIR}/download_libs.sh"
130131
exit 1
131132
;;
132133
esac

0 commit comments

Comments
 (0)