From 4d676a245cbbca6574a4e738a7a9f8320e50916b Mon Sep 17 00:00:00 2001 From: Aaron Clarke Date: Fri, 6 Mar 2020 15:27:59 -0800 Subject: [PATCH 1/2] Started deleting .DS_Store files so licenses can run on mac os x. --- ci/licenses.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ci/licenses.sh b/ci/licenses.sh index d411c875bf845..d86e1b5affebc 100755 --- a/ci/licenses.sh +++ b/ci/licenses.sh @@ -9,6 +9,9 @@ exitStatus=0 dart --version +# These files trip up the script on Mac OS X. +find . -name ".DS_Store" | xargs rm + (cd flutter/tools/licenses; pub get; dart --enable-asserts lib/main.dart --src ../../.. --out ../../../out/license_script_output --golden ../../ci/licenses_golden) for f in out/license_script_output/licenses_*; do From 170a11e3c5e7ac61e74153bb506ea82a29a14649 Mon Sep 17 00:00:00 2001 From: Aaron Clarke Date: Fri, 6 Mar 2020 15:58:11 -0800 Subject: [PATCH 2/2] switched away from xargs for the case there are no files --- ci/licenses.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/licenses.sh b/ci/licenses.sh index d86e1b5affebc..58b06ea8a179e 100755 --- a/ci/licenses.sh +++ b/ci/licenses.sh @@ -10,7 +10,7 @@ exitStatus=0 dart --version # These files trip up the script on Mac OS X. -find . -name ".DS_Store" | xargs rm +find . -name ".DS_Store" -exec rm {} \; (cd flutter/tools/licenses; pub get; dart --enable-asserts lib/main.dart --src ../../.. --out ../../../out/license_script_output --golden ../../ci/licenses_golden)