diff --git a/apps/projectGenerator b/apps/projectGenerator index ecdb9014eec..98920bc18d4 160000 --- a/apps/projectGenerator +++ b/apps/projectGenerator @@ -1 +1 @@ -Subproject commit ecdb9014eeceec44bdda487bc7cc26ddf2e03d39 +Subproject commit 98920bc18d4c154340cccddb771d777c7cfdb137 diff --git a/scripts/apothecary b/scripts/apothecary index 7d5a6d85683..b80bcb6da62 160000 --- a/scripts/apothecary +++ b/scripts/apothecary @@ -1 +1 @@ -Subproject commit 7d5a6d856838d02224464d57ef19bd17609d4e50 +Subproject commit b80bcb6da628144bbfcdbec04bb5ba916b68281b diff --git a/scripts/dev/download_pg.sh b/scripts/dev/download_pg.sh index 29e2990395f..369fb620b1d 100755 --- a/scripts/dev/download_pg.sh +++ b/scripts/dev/download_pg.sh @@ -54,7 +54,7 @@ trapError() { if [ -e openFrameworksLibs* ]; then echo "removing packages" - rm openFrameworksLibs* + rm openFrameworksLibs* fi exit "${code}" } @@ -157,7 +157,7 @@ fi SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cd "$SCRIPT_DIR" -OUTDIR=../../../../ +OUTDIR=../../ if [[ $BLEEDING_EDGE = 1 ]] ; then @@ -190,7 +190,7 @@ cd download download $PKG -echo " Uncompressing Project Generator for $PLATFORM from $PKG" +echo " Uncompressing Project Generator for [$PLATFORM] from [$PKG] to [${OUTDIR}/$OUTPUT]" if [ "$PLATFORM" == "msys2" ] || [ "$PLATFORM" == "vs" ]; then unzip -q "$PKG" -d "$OUTPUT" #rm $PKG @@ -207,7 +207,7 @@ if [ "$PLATFORM" == "msys2" ] || [ "$PLATFORM" == "vs" ]; then if ! command -v rsync &> /dev/null then - cp -ar ${OUTPUT}/ ${OUTDIR}/${OUTPUT} + cp -arX ${OUTPUT}/ ${OUTDIR}/${OUTPUT} else rsync -a ${OUTPUT}/ ${OUTDIR}/${OUTPUT} fi @@ -215,9 +215,9 @@ if [ "$PLATFORM" == "msys2" ] || [ "$PLATFORM" == "vs" ]; then else if ! command -v rsync &> /dev/null then - cp -ar $OUTPUT/projectGenerator$EXT $OUTDIR/ + cp -arX $OUTPUT/projectGenerator$EXT $OUTDIR/ else - rsync -a $OUTPUT/projectGenerator$EXT $OUTDIR + rsync -a $OUTPUT/projectGenerator$EXT $OUTDIR fi rm -rf $OUTPUT/projectGenerator$EXT @@ -227,7 +227,4 @@ rm -rf $OUTPUT # rm -rf $PKG echo " ------ " -echo " openFrameworks download projectGenerator and install complete!" - - - +echo " openFrameworks download projectGenerator and install complete!" \ No newline at end of file