From 570a44e71d90cf3e4c98978b6ebad472ae0ed3cb Mon Sep 17 00:00:00 2001 From: Dimitre Date: Sat, 11 May 2024 19:42:44 -0300 Subject: [PATCH] up --- scripts/ci/msys2/install.sh | 0 scripts/dev/download_libs.sh | 3 +++ scripts/dev/downloader.sh | 6 ++++-- scripts/msys2/buildAllExamples.sh | 0 scripts/msys2/cleanAllExamples.sh | 0 scripts/msys2/compileOF.sh | 0 scripts/msys2/install_dependencies.sh | 0 7 files changed, 7 insertions(+), 2 deletions(-) mode change 100644 => 100755 scripts/ci/msys2/install.sh mode change 100644 => 100755 scripts/msys2/buildAllExamples.sh mode change 100644 => 100755 scripts/msys2/cleanAllExamples.sh mode change 100644 => 100755 scripts/msys2/compileOF.sh mode change 100644 => 100755 scripts/msys2/install_dependencies.sh diff --git a/scripts/ci/msys2/install.sh b/scripts/ci/msys2/install.sh old mode 100644 new mode 100755 diff --git a/scripts/dev/download_libs.sh b/scripts/dev/download_libs.sh index 347cb56b866..f05dd917c3c 100755 --- a/scripts/dev/download_libs.sh +++ b/scripts/dev/download_libs.sh @@ -182,6 +182,7 @@ if [ "$PLATFORM" == "linux" ] && [ "$ARCH" == "64" ]; then fi fi +# if [ "$PLATFORM" == "osx" ]; then if [ "$PLATFORM" == "msys2" ]; then PKGS="openFrameworksLibs_${VER}_${PLATFORM}_${ARCH}.zip" elif [ "$ARCH" == "" ] && [ "$PLATFORM" == "vs" ]; then @@ -249,6 +250,8 @@ if [ $OVERWRITE -eq 1 ]; then done fi +echo "PKGS $PKGS" + for PKG in $PKGS; do echo "Uncompressing libraries ${PLATFORM}${ARCH} from $PKG" if [ "$PLATFORM" == "msys2" ] || [ "$PLATFORM" == "vs" ]; then diff --git a/scripts/dev/downloader.sh b/scripts/dev/downloader.sh index bc7808fc48e..d3eb858eab7 100755 --- a/scripts/dev/downloader.sh +++ b/scripts/dev/downloader.sh @@ -36,9 +36,11 @@ downloader() { # else if command -v wget2 2>/dev/null; then wget2 $@; - elif command -v curl 2>/dev/null; then + elif + command -v curl 2>/dev/null; then for PKG in $@; do - curl -LO --retry 20 -O --progress-bar $PKG; + echo "curl -LO --progress-bar $PKG" + curl -L --retry 20 --progress-bar -O $PKG done else for PKG in $@; do diff --git a/scripts/msys2/buildAllExamples.sh b/scripts/msys2/buildAllExamples.sh old mode 100644 new mode 100755 diff --git a/scripts/msys2/cleanAllExamples.sh b/scripts/msys2/cleanAllExamples.sh old mode 100644 new mode 100755 diff --git a/scripts/msys2/compileOF.sh b/scripts/msys2/compileOF.sh old mode 100644 new mode 100755 diff --git a/scripts/msys2/install_dependencies.sh b/scripts/msys2/install_dependencies.sh old mode 100644 new mode 100755