From f72452d04f619658da968e04b9a94fb9d4f327aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Mon, 21 Oct 2019 23:49:45 +0200 Subject: [PATCH] fix matching deps with only one dependency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit those often end with (*) since their base dep was already listed Signed-off-by: Jakub SokoĊ‚owski --- .../android/maven-and-npm-deps/maven/fetch-maven-deps.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nix/mobile/android/maven-and-npm-deps/maven/fetch-maven-deps.sh b/nix/mobile/android/maven-and-npm-deps/maven/fetch-maven-deps.sh index c53382fcd0..7111588469 100755 --- a/nix/mobile/android/maven-and-npm-deps/maven/fetch-maven-deps.sh +++ b/nix/mobile/android/maven-and-npm-deps/maven/fetch-maven-deps.sh @@ -92,12 +92,12 @@ function runGradleDepsCommand() { echo "# $1" # Run the gradle command and: - # - remove lines that end with (*) or (n) + # - remove lines that end with (*) or (n) but don't start with (+) # - keep only lines that start with \--- or +--- # - remove lines that refer to a project # - extract the package name and version, ignoring version range indications, such as in `com.google.android.gms:play-services-ads:[15.0.1,16.0.0) -> 15.0.1` gradle $1 $gradle_opts \ - | grep --invert-match -E ".+ \([\*n]\)$" \ + | grep --invert-match -E "^[^+].+ \([\*n]\)$" \ | grep -e "[\\\+]---" \ | grep --invert-match -e "--- project :" \ | sed -E "s;.*[\\\+]--- ([^ ]+:)(.+ -> )?([^ ]+).*$;\1\3;"