Skip to content

Commit dee2eb7

Browse files
authored
Submodules sync and pg fix paths (#8014)
1 parent 25d0a4b commit dee2eb7

File tree

3 files changed

+9
-12
lines changed

3 files changed

+9
-12
lines changed

scripts/apothecary

Submodule apothecary updated 242 files

scripts/dev/download_pg.sh

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ trapError() {
5454

5555
if [ -e openFrameworksLibs* ]; then
5656
echo "removing packages"
57-
rm openFrameworksLibs*
57+
rm openFrameworksLibs*
5858
fi
5959
exit "${code}"
6060
}
@@ -157,7 +157,7 @@ fi
157157
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
158158
cd "$SCRIPT_DIR"
159159

160-
OUTDIR=../../../../
160+
OUTDIR=../../
161161

162162

163163
if [[ $BLEEDING_EDGE = 1 ]] ; then
@@ -190,7 +190,7 @@ cd download
190190

191191
download $PKG
192192

193-
echo " Uncompressing Project Generator for $PLATFORM from $PKG"
193+
echo " Uncompressing Project Generator for [$PLATFORM] from [$PKG] to [${OUTDIR}/$OUTPUT]"
194194
if [ "$PLATFORM" == "msys2" ] || [ "$PLATFORM" == "vs" ]; then
195195
unzip -q "$PKG" -d "$OUTPUT"
196196
#rm $PKG
@@ -207,17 +207,17 @@ if [ "$PLATFORM" == "msys2" ] || [ "$PLATFORM" == "vs" ]; then
207207

208208
if ! command -v rsync &> /dev/null
209209
then
210-
cp -ar ${OUTPUT}/ ${OUTDIR}/${OUTPUT}
210+
cp -arX ${OUTPUT}/ ${OUTDIR}/${OUTPUT}
211211
else
212212
rsync -a ${OUTPUT}/ ${OUTDIR}/${OUTPUT}
213213
fi
214214
rm -rf $OUTPUT
215215
else
216216
if ! command -v rsync &> /dev/null
217217
then
218-
cp -ar $OUTPUT/projectGenerator$EXT $OUTDIR/
218+
cp -arX $OUTPUT/projectGenerator$EXT $OUTDIR/
219219
else
220-
rsync -a $OUTPUT/projectGenerator$EXT $OUTDIR
220+
rsync -a $OUTPUT/projectGenerator$EXT $OUTDIR
221221
fi
222222
rm -rf $OUTPUT/projectGenerator$EXT
223223

@@ -227,7 +227,4 @@ rm -rf $OUTPUT
227227
# rm -rf $PKG
228228

229229
echo " ------ "
230-
echo " openFrameworks download projectGenerator and install complete!"
231-
232-
233-
230+
echo " openFrameworks download projectGenerator and install complete!"

0 commit comments

Comments
 (0)