Skip to content

Commit 444faba

Browse files
committed
Put output in "dist" directory instead of homedir.
1 parent 929d56a commit 444faba

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
*~
33
/dev_bundle
44
/dev_bundle*.tar.gz
5+
/dist

admin/build-release.sh

+8-8
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,18 @@ mkdir -p "$PREFIX"
2424
VERSION="$($PREFIX/bin/meteor --version | sed 's/.* //')"
2525

2626
# tar it up
27-
TARBALL=~/meteor-package-${UNAME}-${ARCH}-${VERSION}.tar.gz
27+
OUTDIR="$TOPDIR/dist"
28+
rm -rf "$OUTDIR"
29+
mkdir -p "$OUTDIR"
30+
TARBALL="$OUTDIR/meteor-package-${UNAME}-${ARCH}-${VERSION}.tar.gz"
2831
echo "Tarring to: $TARBALL"
2932

3033
tar -C "$PREFIX" --exclude .meteor/local -czf "$TARBALL" meteor
3134

3235

3336
if [ "$UNAME" == "Linux" ] ; then
3437
echo "Building debian package"
35-
DEBDIR="TMPDIR/debian"
38+
DEBDIR="$TMPDIR/debian"
3639
mkdir "$DEBDIR"
3740
cd "$DEBDIR"
3841
cp "$TARBALL" "meteor_${VERSION}.orig.tar.gz"
@@ -41,16 +44,13 @@ if [ "$UNAME" == "Linux" ] ; then
4144
cp -r "$TOPDIR/admin/debian" .
4245
export TARBALL
4346
dpkg-buildpackage
44-
45-
# XXX!
46-
cp ../*.deb ~
47+
cp ../*.deb "$OUTDIR"
4748

4849

4950
echo "Building RPM"
50-
# XXX how to set rpm build dir to not be ~/rpmbuild
5151
rpmbuild -bb --define="TARBALL $TARBALL" "$TOPDIR/admin/meteor.spec"
5252

53-
# XXX
54-
cp ~/rpmbuild/RPMS/*/*.rpm ~
53+
# XXX how to set rpm build dir to not be ~/rpmbuild
54+
cp ~/rpmbuild/RPMS/*/*.rpm "$OUTDIR"
5555

5656
fi

0 commit comments

Comments
 (0)