[FLUME-1840] here-doc syntax of saveVersion.sh breaks on FreeBSD

• Type: Bug
• Status: Open
• Priority: Minor
• Resolution: Unresolved
• Affects Version/s: 1.3.1
• Component/s: Build
• Labels: patch

Environment

FreeBSD 8

• Assignee: Unassigned
• Reporter: Jeff Bachtel
• Created: 14/Jan/13 21:23
• Updated: 14/Jan/13 22:08

Description

Building FLUME as retrieved from git, failed during compile on FreeBSD 8. The cause turned out to be the here-doc syntax being slightly off on saveVersion.sh . Possibly the BSD shell is being more strict on syntax.

Throwing the trivial patch in here, vice a pull req:

diff --git a/flume-ng-core/scripts/saveVersion.sh b/flume-ng-core/scripts/saveVersion.sh
index ad3f8b1..82666cd 100755
— a/flume-ng-core/scripts/saveVersion.sh
+++ b/flume-ng-core/scripts/saveVersion.sh
@@ -54,7 +54,7 @@ else
fi

mkdir -p $buildDirectory/generated-sources/java/org/apache/flume/
-cat << EOF | \
+cat <<EOF | \
sed -e "s/VERSION/$version/" -e "s/USER/$user/" -e "s/DATE/$date/" \
-e "s|URL|$url|" -e "s/REV/$revision/" \
-e "s|BRANCH|$branch|" -e "s/SRCCHECKSUM/$srcChecksum/" \
@@ -66,4 +66,4 @@ cat << EOF | \
user="USER", date="DATE", url="URL",
srcChecksum="SRCCHECKSUM")
package org.apache.flume;
-EOF
\ No newline at end of file
+EOF