Revert to explicit description of package

The previous way is causing fpm issues due to quoting.
pull/4335/head
Philip O'Toole 2015-10-05 13:51:04 -07:00
parent a8f601986d
commit fa5de49d2e
1 changed files with 4 additions and 5 deletions

View File

@ -55,7 +55,7 @@ LICENSE=MIT
URL=influxdb.com
MAINTAINER=support@influxdb.com
VENDOR=Influxdb
DESCRIPTION="\"Distributed time-series database\""
DESCRIPTION="Distributed time-series database"
# Allow path to FPM to be set by environment variables. Some execution contexts
# like cron don't have PATH set correctly to pick it up.
@ -517,12 +517,11 @@ COMMON_FPM_ARGS="\
--after-install $POST_INSTALL_PATH \
--after-remove $POST_UNINSTALL_PATH \
--name influxdb \
--description "$DESCRIPTION" \
--config-files $CONFIG_ROOT_DIR \
--config-files $LOGROTATE_DIR"
if [ -n "$DEB_WANTED" ]; then
$FPM -s dir -t deb $deb_args $COMMON_FPM_ARGS --version `full_version $VERSION $RC` .
$FPM -s dir -t deb $deb_args --description "$DESCRIPTION" $COMMON_FPM_ARGS --version `full_version $VERSION $RC` .
if [ $? -ne 0 ]; then
echo "Failed to create Debian package -- aborting."
cleanup_exit 1
@ -531,7 +530,7 @@ if [ -n "$DEB_WANTED" ]; then
fi
if [ -n "$TAR_WANTED" ]; then
$FPM -s dir -t tar --prefix influxdb_`full_version $VERSION $RC`_${ARCH} -p influxdb_`full_version $VERSION $RC`_${ARCH}.tar.gz $COMMON_FPM_ARGS --version `full_version $VERSION $RC ` .
$FPM -s dir -t tar --prefix influxdb_`full_version $VERSION $RC`_${ARCH} -p influxdb_`full_version $VERSION $RC`_${ARCH}.tar.gz --description "$DESCRIPTION" $COMMON_FPM_ARGS --version `full_version $VERSION $RC ` .
if [ $? -ne 0 ]; then
echo "Failed to create Tar package -- aborting."
cleanup_exit 1
@ -540,7 +539,7 @@ if [ -n "$TAR_WANTED" ]; then
fi
if [ -n "$RPM_WANTED" ]; then
$rpm_args $FPM -s dir -t rpm $COMMON_FPM_ARGS --depends coreutils --version $VERSION --iteration `rpm_release $RC` .
$rpm_args $FPM -s dir -t rpm --description "$DESCRIPTION" $COMMON_FPM_ARGS --depends coreutils --version $VERSION --iteration `rpm_release $RC` .
if [ $? -ne 0 ]; then
echo "Failed to create RPM package -- aborting."
cleanup_exit 1