Merge pull request #1736 from influxdb/explicit_bins

Explicitly name installation binaries
pull/1751/head
Philip O'Toole 2015-02-25 11:19:31 -08:00
commit 0731abd0e1
1 changed files with 16 additions and 7 deletions

View File

@ -49,6 +49,11 @@ MAINTAINER=support@influxdb.com
VENDOR=Influxdb VENDOR=Influxdb
DESCRIPTION="Distributed time-series database" DESCRIPTION="Distributed time-series database"
BINS=(
influxd
influx
)
########################################################################### ###########################################################################
# Helper functions. # Helper functions.
@ -134,7 +139,9 @@ do_build() {
cleanup_exit 1 cleanup_exit 1
fi fi
rm $GOPATH/bin/* for b in ${BINS[*]}; do
rm -f $GOPATH/bin/$b
done
go get -u -f ./... go get -u -f ./...
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "WARNING: failed to 'go get' packages." echo "WARNING: failed to 'go get' packages."
@ -207,12 +214,14 @@ make_dir_tree $TMP_WORK_DIR $VERSION
########################################################################### ###########################################################################
# Copy the assets to the installation directories. # Copy the assets to the installation directories.
cp $GOPATH/bin/* $TMP_WORK_DIR/$INSTALL_ROOT_DIR/versions/$VERSION for b in ${BINS[*]}; do
if [ $? -ne 0 ]; then cp $GOPATH/bin/$b $TMP_WORK_DIR/$INSTALL_ROOT_DIR/versions/$VERSION
echo "Failed to copy binaries to packaging directory -- aborting." if [ $? -ne 0 ]; then
cleanup_exit 1 echo "Failed to copy binaries to packaging directory -- aborting."
fi cleanup_exit 1
echo "Binaries in $GOPATH/bin copied to $TMP_WORK_DIR/$INSTALL_ROOT_DIR/versions/$VERSION" fi
done
echo "${BINS[*]} copied to $TMP_WORK_DIR/$INSTALL_ROOT_DIR/versions/$VERSION"
cp $INITD_SCRIPT $TMP_WORK_DIR/$INSTALL_ROOT_DIR/versions/$VERSION/scripts cp $INITD_SCRIPT $TMP_WORK_DIR/$INSTALL_ROOT_DIR/versions/$VERSION/scripts
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then