Skip to content

Submodules sync and pg fix paths #8014

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/apothecary
Submodule apothecary updated 242 files
17 changes: 7 additions & 10 deletions scripts/dev/download_pg.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ trapError() {

if [ -e openFrameworksLibs* ]; then
echo "removing packages"
rm openFrameworksLibs*
rm openFrameworksLibs*
fi
exit "${code}"
}
Expand Down Expand Up @@ -157,7 +157,7 @@ fi
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
cd "$SCRIPT_DIR"

OUTDIR=../../../../
OUTDIR=../../


if [[ $BLEEDING_EDGE = 1 ]] ; then
Expand Down Expand Up @@ -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
Expand All @@ -207,17 +207,17 @@ 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
rm -rf $OUTPUT
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

Expand All @@ -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!"
Loading