From 38d0e8cd39fee90a5f5f83f0ffe7ab711914e87f Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Fri, 23 Feb 2018 22:28:53 +0100
Subject: [PATCH] gitlat-ci: fix detection of appids changed in this merge
 request

It was detecting changed description files in subfolders, i.e.:
metadata/org.fdroid.fdroid.ota/en-US/description.txt
metadata/org.fdroid.fdroid.ota/en-US/summary.txt
---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c59cb228e3..ae664950d9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,8 +15,8 @@ lint:
         git fetch https://gitlab.com/fdroid/fdroiddata;
         test -d build || mkdir build;
         for f in `git diff --name-only FETCH_HEAD`; do
-           appid=`echo $f | sed -n -e 's,^metadata/\(.*\)\.txt,\1,p'
-                                   -e 's,^metadata/\(.*\)\.yml,\1,p'`;
+           appid=`echo $f | sed -n -e 's,^metadata/\([^/][^/]*\)\.txt,\1,p'
+                                   -e 's,^metadata/\([^/][^/]*\)\.yml,\1,p'`;
            export CHANGED="$CHANGED $appid";
            grep -q "^Repo *Type\W *git" $f && git -C build clone `sed -n "s,^Repo *:,,p" $f` $appid;
         done;