Repository: flume
Updated Branches:
  refs/heads/trunk 3d7b9ff40 -> 1dea93653


Make license-diff.sh work on macOS

readlink -f is not portable

Reviewers: Bessenyei Balázs Donát, Peter Turcsanyi


Project: http://git-wip-us.apache.org/repos/asf/flume/repo
Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/bf5d6eb6
Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/bf5d6eb6
Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/bf5d6eb6

Branch: refs/heads/trunk
Commit: bf5d6eb618ed13ac1cb36d152f64d917e972b9c4
Parents: 3d7b9ff
Author: Mike Percy <[email protected]>
Authored: Thu Dec 6 00:36:59 2018 -0800
Committer: Mike Percy <[email protected]>
Committed: Fri Dec 7 08:24:05 2018 -0800

----------------------------------------------------------------------
 dev-support/license-diff.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flume/blob/bf5d6eb6/dev-support/license-diff.sh
----------------------------------------------------------------------
diff --git a/dev-support/license-diff.sh b/dev-support/license-diff.sh
index 87c6947..2f1df5d 100755
--- a/dev-support/license-diff.sh
+++ b/dev-support/license-diff.sh
@@ -20,8 +20,7 @@
 # Script to compare LICENSE file content and distributed jars
 # use after flume-ng-dist target has been generated (mvn clean package)
 
################################################################################
-PROJECT_ROOT="$(dirname $(readlink -f $0))/.."
-
+PROJECT_ROOT="$(cd $(dirname $0)/..; pwd)"
 
 echo "LICENSE file <---------> jar files"
-diff -y <(grep .jar: ${PROJECT_ROOT}/LICENSE | sed -E 's/:|\s+//g' | sort) 
<(ls 
${PROJECT_ROOT}/flume-ng-dist/target/apache-flume-*-bin/apache-flume-*-bin/lib/*.jar
 |xargs -n1 basename |grep -v flume | sed -E 
's/(.+)-([^-]+).jar/\1-<version>.jar/' | uniq | sort)
\ No newline at end of file
+diff -y <(grep .jar: ${PROJECT_ROOT}/LICENSE | sed -E 's/:|\s+//g' | sort) 
<(ls 
${PROJECT_ROOT}/flume-ng-dist/target/apache-flume-*-bin/apache-flume-*-bin/lib/*.jar
 |xargs -n1 basename |grep -v flume | sed -E 
's/(.+)-([^-]+).jar/\1-<version>.jar/' | uniq | sort)

Reply via email to