diff options
| author | Joseph Hunkeler <jhunkeler@users.noreply.github.com> | 2018-12-13 10:51:57 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-13 10:51:57 -0500 |
| commit | b8459befaa7b4b0fd5ad17bfc73a5a1bc3659ded (patch) | |
| tree | edf2d319ea4bab87c06897eeb9e897d519a6d712 | |
| parent | bc5248659adff01c5942e7220e5bb385e241b072 (diff) | |
| download | astroconda-dev-b8459befaa7b4b0fd5ad17bfc73a5a1bc3659ded.tar.gz | |
Prevent spurious 'work/' directory (#177)
| -rw-r--r-- | webbpsf-data/build.sh | 11 | ||||
| -rw-r--r-- | 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 79745f4..01b0c6e 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 243a3f3..8f0c482 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: http://www.stsci.edu/~mperrin/software/webbpsf |