Skip to content

Commit 958daca

Browse files
committed
autogen: update license overview
1 parent 9d0f742 commit 958daca

3 files changed

Lines changed: 6 additions & 5 deletions

File tree

‎.bin/license-engine.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ ALLOWED_LICENSES=(
1313
'Apache-2.0'
1414
'(Apache-2.0 OR MPL-1.1)'
1515
'Apache-2.0 AND MIT'
16+
'(Apache-2.0 AND MIT)'
1617
'Apache License, Version 2.0'
1718
'Apache*'
1819
'Artistic-2.0'

‎.bin/licenses‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#!/bin/sh
2-
set -e
1+
#!/bin/bash
2+
set -eo pipefail
33

44
# Get the directory where this script is located
55
bin_dir="$(cd "$(dirname "$0")" && pwd)"

‎.bin/list-licenses‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#!/bin/sh
2-
set -e
1+
#!/bin/bash
2+
set -eo pipefail
33

44
bin_dir="$(cd "$(dirname "$0")" && pwd)"
55

@@ -32,7 +32,7 @@ if [ -f go.mod ]; then
3232
if [ -z "$go_packages" ]; then
3333
echo "No Go modules found" >&2
3434
else
35-
echo "$go_packages" | xargs -I {} sh -c '.bin/go-licenses report --template .bin/license-template-go.tpl {}' | grep -v '^$'
35+
echo "$go_packages" | xargs -I {} "${bin_dir}/go-licenses" report --template "${bin_dir}/license-template-go.tpl" {} | grep -v '^$'
3636
echo
3737
fi
3838
fi

0 commit comments

Comments
 (0)