summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Shorin <kxepal@apache.org>2015-12-28 23:07:23 +0300
committerAlexander Shorin <kxepal@apache.org>2015-12-28 23:16:39 +0300
commit961b5f796437324a90f041a463950242d531e79c (patch)
tree36a4c0ac5919caaf26f5dbc8bc2433473c567252
parente40083ef3ddae156d90718cfc59bb608728d4c72 (diff)
downloadcouchdb-961b5f796437324a90f041a463950242d531e79c.tar.gz
Fix tar'ing on FreeBSD
-rwxr-xr-xbuild-aux/couchdb-build-release.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/build-aux/couchdb-build-release.sh b/build-aux/couchdb-build-release.sh
index 47c3926cd..d169d2e1c 100755
--- a/build-aux/couchdb-build-release.sh
+++ b/build-aux/couchdb-build-release.sh
@@ -17,7 +17,7 @@ mkdir $RELDIR
CURRENT_BRANCH=`git rev-parse --abbrev-ref HEAD`
# copy sources over
-git archive $CURRENT_BRANCH | tar -xC $RELDIR/
+git archive $CURRENT_BRANCH | tar -xC $RELDIR/ -f -
mkdir $RELDIR/src
cd src/
@@ -25,7 +25,7 @@ for repo in *; do
cd $repo
mkdir ../../$RELDIR/src/$repo
git_ish=`git rev-parse --short HEAD`
- git archive $git_ish | tar -xC ../../$RELDIR/src/$repo/
+ git archive $git_ish | tar -xC ../../$RELDIR/src/$repo/ -f -
set +e
grep -rl '{vsn, git}' ../../$RELDIR/src/$repo/ | xargs sed -i "s/{vsn, git}/{vsn, \"`git describe --always --tags`\"}/" 2> /dev/null
set -e