Mercurial > hg > vamp-build-and-test
changeset 53:b584009ded4c
Fixes to package
| author | Chris Cannam |
|---|---|
| date | Thu, 07 Aug 2014 19:49:13 +0100 |
| parents | e4aed5b253da |
| children | 6624f5416d67 |
| files | SCRIPTS/process.sh |
| diffstat | 1 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/SCRIPTS/process.sh Thu Aug 07 20:30:42 2014 +0100 +++ b/SCRIPTS/process.sh Thu Aug 07 19:49:13 2014 +0100 @@ -452,11 +452,11 @@ echo "ERROR: no README file found" | tee -a "$log" good=no fi - if ! ls -1 "$dir" | egrep -qi "^(copying|licen[cs]e)(.txt|)$"; then + if ! ls -1 "$dir" | egrep -qi "^(copying|licen[cs]e)(.txt)?$"; then echo "ERROR: no COPYING or LICEN[CS]E file found" | tee -a "$log" good=no fi - if ! ls -1 "$dir" | egrep -qi "^citation(.txt|)$"; then + if ! ls -1 "$dir" | egrep -qi "^citation(.txt)?$"; then echo "NOTE: no CITATION file found" | tee -a "$log" fi [ "$good" = "yes" ] @@ -496,7 +496,8 @@ package() { dir="$1" id=$(vcs_id "$dir") - pdir="$packagedir/$dir-$platform$bits-$id" + pstub="$dir-$platform$bits-$id" + pdir="$packagedir/$pstub" mkdir -p "$pdir" ( cd "$dir" ; cp -av \ @@ -513,11 +514,11 @@ ) ( cd "$packagedir"; if [ "$platform" = "mingw" ]; then - zip "$dir-$id".zip "$dir-$id" + zip "$pstub".zip "$pstub" else - tar cvjf "$dir-$id".tar.bz2 "$dir-$id" + tar cvjf "$pstub".tar.bz2 "$pstub" fi; - rm -rf "$dir-$id" + rm -rf "$pstub" ) }