diff --git a/scripts/android/download_libs.sh b/scripts/android/download_libs.sh index f1f35be3f5a..27580d660fa 100755 --- a/scripts/android/download_libs.sh +++ b/scripts/android/download_libs.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cd $SCRIPT_DIR -../dev/download_libs.sh -p android $@ +../dev/download_libs.sh -p android -b $@ diff --git a/scripts/dev/download_libs.sh b/scripts/dev/download_libs.sh index c107edf5970..ccc55819901 100755 --- a/scripts/dev/download_libs.sh +++ b/scripts/dev/download_libs.sh @@ -8,7 +8,7 @@ LEGACY=0 SILENT_ARGS="" NO_SSL="" BLEEDING_EDGE=0 -DL_VERSION=2.6.4 +DL_VERSION=2.6.5 TAG="" printHelp(){ @@ -294,8 +294,7 @@ elif [ "$ARCH" == "" ] && [ "$PLATFORM" == "android" ]; then if [[ $BLEEDING_EDGE = 1 ]] ; then PKGS="openFrameworksLibs_${VER}_${PLATFORM}_armv7.tar.bz2 \ openFrameworksLibs_${VER}_${PLATFORM}_arm64.tar.bz2 \ - openFrameworksLibs_${VER}_${PLATFORM}_x86_64.tar.bz2 - openFrameworksLibs_${VER}_${PLATFORM}_x86.tar.bz2" + openFrameworksLibs_${VER}_${PLATFORM}_x86_64.tar.bz2" else PKGS="openFrameworksLibs_${VER}_${PLATFORM}armv7.tar.bz2 \ openFrameworksLibs_${VER}_${PLATFORM}arm64.tar.bz2 \ diff --git a/scripts/of.sh b/scripts/of.sh index ecbcb8f63b3..9f28e49a3c2 100755 --- a/scripts/of.sh +++ b/scripts/of.sh @@ -1,6 +1,6 @@ #!/bin/bash # pipe commands to core openFrameworks scripts -OF_SCRIPT_VERSION=0.2.1 +OF_SCRIPT_VERSION=0.2.2 # Dan Rosser 2025 OF_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" OF_DIR="$(realpath "$OF_DIR/../")" @@ -9,7 +9,7 @@ OF_CORE_CI_SCRIPT_DIR="$(realpath "$OF_DIR/scripts/ci")" OF_PG_INSTALLED_DIR="$(realpath "$OF_DIR/projectGenerator")" VERBOSE=${VERBOSE:-0} echoVerbose() { - if [[ -n "$VERBOSE" ]]; then + if [[ "$VERBOSE" = 1 ]]; then echo "$@" fi } @@ -75,6 +75,7 @@ Usage: $0 [subcommand] [options] Commands: update [subcommand] Update openFrameworks components libs Download openFrameworks libraries (default) + libs [platform] i.e update libs ios pg | projectgenerator Download Project Generator version [subcommand] Show version information @@ -126,7 +127,7 @@ runCommand() { SCRIPT="${OF_CORE_SCRIPT_DIR}/${PLATFORM_DIR}/download_projectGenerator.sh" ;; *) - SCRIPT="${OF_CORE_SCRIPT_DIR}/${PLATFORM_DIR}/download_libs.sh" "" + SCRIPT="${OF_CORE_SCRIPT_DIR}/${PLATFORM_DIR}/download_libs.sh" exit 1 ;; esac