From cced3d732a9595ca90189a6cab72f2eaec5119f1 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Thu, 13 Dec 2018 10:58:30 -0500 Subject: Prevent spurious 'work/' directory (#177) (#437) --- webbpsf-data/build.sh | 11 +++++++++-- webbpsf-data/meta.yaml | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/webbpsf-data/build.sh b/webbpsf-data/build.sh index b512892..52e35a3 100644 --- a/webbpsf-data/build.sh +++ b/webbpsf-data/build.sh @@ -1,8 +1,15 @@ - mkdir -p $PREFIX/share mkdir -p $PREFIX/etc/conda/activate.d mkdir -p $PREFIX/etc/conda/deactivate.d -cp -a `pwd` $PREFIX/share/webbpsf-data + +# Different conda-build releases do different things +# SRC_DIR is "usedir" for all intents and purposes +usedir="$(pwd)" +if [[ -d ${usedir}/work ]]; then + usedir=${usedir}/work +fi + +rsync -a ${usedir}/* $PREFIX/share/webbpsf-data echo " export WEBBPSF_PATH=$PREFIX/share/webbpsf-data diff --git a/webbpsf-data/meta.yaml b/webbpsf-data/meta.yaml index 9a0e37c..7210d39 100644 --- a/webbpsf-data/meta.yaml +++ b/webbpsf-data/meta.yaml @@ -1,6 +1,6 @@ {% set name = 'webbpsf-data' %} {% set version = '0.7.0' %} -{% set number = '0' %} +{% set number = '1' %} about: home: https://webbpsf.readthedocs.io -- cgit