Repository: flume Updated Branches: refs/heads/flume-1.9 4fcf23d7e -> 517ef269e
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/0409289e Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/0409289e Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/0409289e Branch: refs/heads/flume-1.9 Commit: 0409289e839611d39de2801550b0ae3f944ed3f2 Parents: 4fcf23d Author: Mike Percy <[email protected]> Authored: Thu Dec 6 00:36:59 2018 -0800 Committer: Ferenc Szabo <[email protected]> Committed: Mon Dec 10 02:45:37 2018 +0100 ---------------------------------------------------------------------- dev-support/license-diff.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flume/blob/0409289e/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)
