You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2019/12/06 11:16:17 UTC

[brooklyn-dist] branch master updated: mark these scripts as bash, they don't work under zsh

This is an automated email from the ASF dual-hosted git repository.

heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git


The following commit(s) were added to refs/heads/master by this push:
     new f7de913  mark these scripts as bash, they don't work under zsh
     new 4a2193b  This closes #149
f7de913 is described below

commit f7de91364e33f1b2bc73f23018698837d4aa5fcb
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Thu Dec 5 12:06:57 2019 +0000

    mark these scripts as bash, they don't work under zsh
---
 dist/licensing/generate-all.sh                |  2 ++
 dist/licensing/generate-license-and-notice.sh | 11 +++++++++++
 2 files changed, 13 insertions(+)

diff --git a/dist/licensing/generate-all.sh b/dist/licensing/generate-all.sh
index 4c1a0a1..8de8d24 100755
--- a/dist/licensing/generate-all.sh
+++ b/dist/licensing/generate-all.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
diff --git a/dist/licensing/generate-license-and-notice.sh b/dist/licensing/generate-license-and-notice.sh
index 09a8175..0f3bbcf 100755
--- a/dist/licensing/generate-license-and-notice.sh
+++ b/dist/licensing/generate-license-and-notice.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
@@ -146,6 +148,15 @@ if [ ! -z "$LIBRARIES" ] ; then
 fi
 
 process_dependencies() {
+  echo running mvn license-audit-maven-plugin:notices
+  echo mvn -X org.heneveld.maven:license-audit-maven-plugin:notices \
+        -DlicensesPreferred=Apache-2.0,Apache,EPL-1.0,BSD-2-Clause,BSD-3-Clause,CDDL-1.1,CDDL-1.0,CDDL \
+        -DoverridesFile=$TEMP_METADATA_FILE \
+        -DoutputYaml=true \
+        -DoutputFile=$TEMP_NOTICE_DATA_FILE \
+        $@
+  echo writing to $TEMP_MVN_OUT
+
   mvn -X org.heneveld.maven:license-audit-maven-plugin:notices \
         -DlicensesPreferred=Apache-2.0,Apache,EPL-1.0,BSD-2-Clause,BSD-3-Clause,CDDL-1.1,CDDL-1.0,CDDL \
         -DoverridesFile=$TEMP_METADATA_FILE \