Remove "implicit trailing *" feature for .sources

2019-03-13 01:19:43 +01:00 · 2019-03-13 01:19:43 +01:00 · d61933d381
commit d61933d381
parent 456817fb58
49 changed files with 178 additions and 185 deletions
--- a/about/codeofconduct.sources
+++ b/about/codeofconduct.sources
@ -1,8 +1,7 @@
 about/people/people:[]
-about/people/employee:[]
-about/people/localteams:[]
+about/people/employees:[]
 about/people/functions:[]
-about/people/function-:[]
+about/people/function-*:[]
 about/people/countries:[]
 about/people/groups:[]
 about/people/volunteers:[]
--- a/about/localteams.sources
+++ b/about/localteams.sources
@ -1,9 +1,9 @@
 about/people/people:[]
 about/people/functions:[]
-about/people/function-:[]
+about/people/function-*:[]
 about/people/countries:[]
 about/people/groups:[]
 about/people/volunteers:[]
-about/people/employee:[]
+about/people/employees:[]
 activities/*/project:[]
 campaigns/*/project:[]
--- a/about/team.sources
+++ b/about/team.sources
@ -1,9 +1,9 @@
 about/people/people:[]
 about/people/functions:[]
-about/people/function-:[]
+about/people/function-*:[]
 about/people/countries:[]
 about/people/groups:[]
 about/people/volunteers:[]
-about/people/employee:[]
+about/people/employees:[]
 activities/*/project:[]
 campaigns/*/project:[]
--- a/activities/education/education.sources
+++ b/activities/education/education.sources
@ -1,7 +1,7 @@
 about/people/people:[]
-about/people/employee:[]
+about/people/employees:[]
 about/people/functions:[]
-about/people/function-:[]
+about/people/function-*:[]
 about/people/countries:[]
 about/people/groups:[]
 about/people/volunteers:[]
@ -9,8 +9,8 @@ activities/*/project:[]
 campaigns/*/project:[]
 contact/local:[]

-news/*/news:[education]
-news/*/.news:[education]
-news/nl/nl:[education]
-news/nl/.nl:[education]
-events/*/event:[education]
+news/*/news-*:[education]
+news/*/.news-*:[education]
+news/nl/nl-*:[education]
+news/nl/.nl-*:[education]
+events/*/event-*:[education]
--- a/activities/ftf/avm-gpl-violation.sources
+++ b/activities/ftf/avm-gpl-violation.sources
@ -1,2 +1,2 @@
-news/*/news:[avm]
-news/*/.news:[avm]
+news/*/news-*:[avm]
+news/*/.news-*:[avm]
--- a/activities/map/de/de.sources
+++ b/activities/map/de/de.sources
@ -1 +1 @@
-activities/map/de/info:[]
+activities/map/de/info-*:[]
--- a/activities/os/os.sources
+++ b/activities/os/os.sources
@ -1,4 +1,4 @@
-news/*/news:[openstandards]
-news/*/.news:[openstandards]
-news/nl/nl:[openstandards]
-news/nl/.nl:[openstandards]
+news/*/news-*:[openstandards]
+news/*/.news-*:[openstandards]
+news/nl/nl-*:[openstandards]
+news/nl/.nl-*:[openstandards]
--- a/activities/procurement/procurement.sources
+++ b/activities/procurement/procurement.sources
@ -1,4 +1,4 @@
-news/*/news:[procurement]
-news/*/.news:[procurement]
-news/nl/nl:[procurement]
-news/nl/.nl:[procurement]
+news/*/news-*:[procurement]
+news/*/.news-*:[procurement]
+news/nl/nl-*:[procurement]
+news/nl/.nl-*:[procurement]
--- a/activities/radiodirective/radiodirective.sources
+++ b/activities/radiodirective/radiodirective.sources
@ -1,4 +1,4 @@
-news/*/news:[radiodirective]
-news/*/.news:[radiodirective]
-news/nl/nl:[radiodirective]
-news/nl/.nl:[radiodirective]
+news/*/news-*:[radiodirective]
+news/*/.news-*:[radiodirective]
+news/nl/nl-*:[radiodirective]
+news/nl/.nl-*:[radiodirective]
--- a/activities/routers/routers.sources
+++ b/activities/routers/routers.sources
@ -1,4 +1,4 @@
-news/*/news:[routers]
-news/*/.news:[routers]
-news/nl/nl:[routers]
-news/nl/.nl:[routers]
+news/*/news-*:[routers]
+news/*/.news-*:[routers]
+news/nl/nl-*:[routers]
+news/nl/.nl-*:[routers]
--- a/activities/wipo/wipo.sources
+++ b/activities/wipo/wipo.sources
@ -1 +1 @@
-activities/wipo/document:[]
+activities/wipo/document-*:[]
--- a/at/at.sources
+++ b/at/at.sources
@ -1,15 +1,15 @@
 about/people/people:[]
-about/people/employee:[]
+about/people/employees:[]
 about/people/functions:[]
-about/people/function-:[]
+about/people/function-*:[]
 about/people/countries:[]
 about/people/groups:[]
 about/people/volunteers:[]
 activities/*/project:[]
 campaigns/*/project:[]

-news/*/news:[at]
-news/*/.news:[at]
-news/nl/nl:[at]
-news/nl/.nl:[at]
-events/*/event:[at]
+news/*/news-*:[at]
+news/*/.news-*:[at]
+news/nl/nl-*:[at]
+news/nl/.nl-*:[at]
+events/*/event-*:[at]
--- a/campaigns/askyourcandidates/askyourcandidates.sources
+++ b/campaigns/askyourcandidates/askyourcandidates.sources
@ -1,4 +1,4 @@
-news/*/news:[ayc]
-news/*/.news:[ayc]
-news/nl/nl:[ayc]
-news/nl/.nl:[ayc]
+news/*/news-*:[ayc]
+news/*/.news-*:[ayc]
+news/nl/nl-*:[ayc]
+news/nl/.nl-*:[ayc]
--- a/campaigns/ilovefs/2012/ilovefs.sources
+++ b/campaigns/ilovefs/2012/ilovefs.sources
@ -1,4 +1,4 @@
-news/*/news:[ilovefs]
-news/*/.news:[ilovefs]
-news/nl/nl:[ilovefs]
-news/nl/.nl:[ilovefs]
+news/*/news-*:[ilovefs]
+news/*/.news-*:[ilovefs]
+news/nl/nl-*:[ilovefs]
+news/nl/.nl-*:[ilovefs]
--- a/campaigns/ilovefs/2012/unperfekthaus.sources
+++ b/campaigns/ilovefs/2012/unperfekthaus.sources
@ -1,4 +1,4 @@
-news/*/news:[ilovefs]
-news/*/.news:[ilovefs]
-news/nl/nl:[ilovefs]
-news/nl/.nl:[ilovefs]
+news/*/news-*:[ilovefs]
+news/*/.news-*:[ilovefs]
+news/nl/nl-*:[ilovefs]
+news/nl/.nl-*:[ilovefs]
--- a/campaigns/ilovefs/2013/ilovefs.sources
+++ b/campaigns/ilovefs/2013/ilovefs.sources
@ -1,4 +1,4 @@
-news/*/news:[ilovefs]
-news/*/.news:[ilovefs]
-news/nl/nl:[ilovefs]
-news/nl/.nl:[ilovefs]
+news/*/news-*:[ilovefs]
+news/*/.news-*:[ilovefs]
+news/nl/nl-*:[ilovefs]
+news/nl/.nl-*:[ilovefs]
--- a/campaigns/ilovefs/2014/ilovefs.sources
+++ b/campaigns/ilovefs/2014/ilovefs.sources
@ -1,4 +1,4 @@
-news/*/news:[ilovefs]
-news/*/.news:[ilovefs]
-news/nl/nl:[ilovefs]
-news/nl/.nl:[ilovefs]
+news/*/news-*:[ilovefs]
+news/*/.news-*:[ilovefs]
+news/nl/nl-*:[ilovefs]
+news/nl/.nl-*:[ilovefs]
--- a/campaigns/ilovefs/2015/ilovefs.sources
+++ b/campaigns/ilovefs/2015/ilovefs.sources
@ -1,4 +1,4 @@
-news/*/news:[ilovefs]
-news/*/.news:[ilovefs]
-news/nl/nl:[ilovefs]
-news/nl/.nl:[ilovefs]
+news/*/news-*:[ilovefs]
+news/*/.news-*:[ilovefs]
+news/nl/nl-*:[ilovefs]
+news/nl/.nl-*:[ilovefs]
--- a/campaigns/ilovefs/2016/index.sources
+++ b/campaigns/ilovefs/2016/index.sources
@ -1,4 +1,4 @@
-news/*/news:[ilovefs]
-news/*/.news:[ilovefs]
-news/nl/nl:[ilovefs]
-news/nl/.nl:[ilovefs]
+news/*/news-*:[ilovefs]
+news/*/.news-*:[ilovefs]
+news/nl/nl-*:[ilovefs]
+news/nl/.nl-*:[ilovefs]
--- a/campaigns/ilovefs/2017/index.sources
+++ b/campaigns/ilovefs/2017/index.sources
@ -1,4 +1,4 @@
-news/*/news:[ilovefs]
-news/*/.news:[ilovefs]
-news/nl/nl:[ilovefs]
-news/nl/.nl:[ilovefs]
+news/*/news-*:[ilovefs]
+news/*/.news-*:[ilovefs]
+news/nl/nl-*:[ilovefs]
+news/nl/.nl-*:[ilovefs]
--- a/campaigns/ilovefs/2018/index.sources
+++ b/campaigns/ilovefs/2018/index.sources
@ -1,4 +1,4 @@
-news/*/news:[ilovefs]
-news/*/.news:[ilovefs]
-news/nl/nl:[ilovefs]
-news/nl/.nl:[ilovefs]
+news/*/news-*:[ilovefs]
+news/*/.news-*:[ilovefs]
+news/nl/nl-*:[ilovefs]
+news/nl/.nl-*:[ilovefs]
--- a/campaigns/ilovefs/2019/index.sources
+++ b/campaigns/ilovefs/2019/index.sources
@ -1,4 +1,4 @@
-news/*/news:[ilovefs]
-news/*/.news:[ilovefs]
-news/nl/nl:[ilovefs]
-news/nl/.nl:[ilovefs]
+news/*/news-*:[ilovefs]
+news/*/.news-*:[ilovefs]
+news/nl/nl-*:[ilovefs]
+news/nl/.nl-*:[ilovefs]
--- a/campaigns/nledu/nledu.sources
+++ b/campaigns/nledu/nledu.sources
@ -1,4 +1,4 @@
-news/*/news:[nledu]
-news/*/.news:[nledu]
-news/nl/nl:[nledu]
-news/nl/.nl:[nledu]
+news/*/news-*:[nledu]
+news/*/.news-*:[nledu]
+news/nl/nl-*:[nledu]
+news/nl/.nl-*:[nledu]
--- a/campaigns/pdfreaders/buglist.sources
+++ b/campaigns/pdfreaders/buglist.sources
@ -1,2 +1,2 @@
-campaigns/pdfreaders/bugs:[]
+campaigns/pdfreaders/bugs-*:[]
 about/people/countries:[]
--- a/campaigns/pdfreaders/pdfreaders.sources
+++ b/campaigns/pdfreaders/pdfreaders.sources
@ -1,3 +1,3 @@
-campaigns/pdfreaders/bugs:[]
+campaigns/pdfreaders/bugs-*:[]
 about/people/countries:[]
 campaigns/pdfreaders/petition-sig:[]
--- a/campaigns/publiccode/bea.sources
+++ b/campaigns/publiccode/bea.sources
@ -1,4 +1,4 @@
-news/*/news:[bea]
-news/*/.news:[bea]
-news/nl/nl:[bea]
-news/nl/.nl:[bea]
+news/*/news-*:[bea]
+news/*/.news-*:[bea]
+news/nl/nl-*:[bea]
+news/nl/.nl-*:[bea]
--- a/campaigns/publiccode/publiccode.sources
+++ b/campaigns/publiccode/publiccode.sources
@ -1,4 +1,4 @@
-news/*/news:[pmpc]
-news/*/.news:[pmpc]
-news/nl/nl:[pmpc]
-news/nl/.nl:[pmpc]
+news/*/news-*:[pmpc]
+news/*/.news-*:[pmpc]
+news/nl/nl-*:[pmpc]
+news/nl/.nl-*:[pmpc]
--- a/campaigns/swpat/documents.sources
+++ b/campaigns/swpat/documents.sources
@ -1 +1 @@
-campaigns/swpat/document:[]
+campaigns/swpat/document-*:[]
--- a/contribute/promotion-materials-archive.sources
+++ b/contribute/promotion-materials-archive.sources
@ -1,2 +1,2 @@
 contribute/promoitems/archived-items:[]
-contribute/promoitems/info-:[]
+contribute/promoitems/info-*:[]
--- a/contribute/spreadtheword.sources
+++ b/contribute/spreadtheword.sources
@ -1,3 +1,3 @@
 contribute/promoitems/active-items:[]
-contribute/promoitems/info-:[]
+contribute/promoitems/info-*:[]
 tools/countries:[]
--- a/contribute/translators/translators.sources
+++ b/contribute/translators/translators.sources
@ -1,8 +1,7 @@
 about/people/people:[]
-about/people/employee:[]
-about/people/localteams:[]
+about/people/employees:[]
 about/people/functions:[]
-about/people/function-:[]
+about/people/function-*:[]
 about/people/countries:[]
 about/people/groups:[]
 about/people/volunteers:[]
--- a/de/de.sources
+++ b/de/de.sources
@ -1,15 +1,15 @@
 about/people/people:[]
-about/people/employee:[]
+about/people/employees:[]
 about/people/functions:[]
-about/people/function-:[]
+about/people/function-*:[]
 about/people/countries:[]
 about/people/groups:[]
 about/people/volunteers:[]
 activities/*/project:[]
 campaigns/*/project:[]

-news/*/news:[de]
-news/*/.news:[de]
-news/nl/nl:[de]
-news/nl/.nl:[de]
-events/*/event:[de]
+news/*/news-*:[de]
+news/*/.news-*:[de]
+news/nl/nl-*:[de]
+news/nl/.nl-*:[de]
+events/*/event-*:[de]
--- a/documents/documents.sources
+++ b/documents/documents.sources
@ -1,6 +1,5 @@
-documents/document:[]
-about/reports/document:[]
-about/history/document:[]
+documents/document-*:[]
+about/reports/document-*:[]
 activities/*/project:[]
 campaigns/*/project:[]
 news/*/document:[]
--- a/ee/ee.sources
+++ b/ee/ee.sources
@ -1,15 +1,15 @@
 about/people/people:[]
-about/people/employee:[]
+about/people/employees:[]
 about/people/functions:[]
-about/people/function-:[]
+about/people/function-*:[]
 about/people/countries:[]
 about/people/groups:[]
 about/people/volunteers:[]
 activities/*/project:[]
 campaigns/*/project:[]

-news/*/news:[ee]
-news/*/.news:[ee]
-news/nl/nl:[ee]
-news/nl/.nl:[ee]
-events/*/event:[ee]
+news/*/news-*:[ee]
+news/*/.news-*:[ee]
+news/nl/nl-*:[ee]
+news/nl/.nl-*:[ee]
+events/*/event-*:[ee]
--- a/events/events.sources
+++ b/events/events.sources
@ -1,2 +1,2 @@
-events/*/event:[]
-events/*/*/event:[]
+events/*/event-*:[]
+events/*/*/event-*:[]
--- a/fellowship/index.sources
+++ b/fellowship/index.sources
@ -1 +1 @@
-events/*/event:[fellowship]
+events/*/event-*:[fellowship]
--- a/fi/fi.sources
+++ b/fi/fi.sources
@ -1,15 +1,15 @@
 about/people/people:[]
-about/people/employee:[]
+about/people/employees:[]
 about/people/functions:[]
-about/people/function-:[]
+about/people/function-*:[]
 about/people/countries:[]
 about/people/groups:[]
 about/people/volunteers:[]
 activities/*/project:[]
 campaigns/*/project:[]

-news/*/news:[fi]
-news/*/.news:[fi]
-news/nl/nl:[fi]
-news/nl/.nl:[fi]
-events/*/event:[fi]
+news/*/news-*:[fi]
+news/*/.news-*:[fi]
+news/nl/nl-*:[fi]
+news/nl/.nl-*:[fi]
+events/*/event-*:[fi]
--- a/fr/fr.sources
+++ b/fr/fr.sources
@ -1,17 +1,15 @@
 about/people/people:[]
-about/people/employee:[]
-about/people/localteams:[]
+about/people/employees:[]
 about/people/functions:[]
-about/people/function-:[]
+about/people/function-*:[]
 about/people/countries:[]
 about/people/groups:[]
 about/people/volunteers:[]
 activities/*/project:[]
 campaigns/*/project:[]
-contact/local:[]

-news/*/news:[fr]
-news/*/.news:[fr]
-news/nl/nl:[fr]
-news/nl/.nl:[fr]
-events/*/event:[fr]
+news/*/news-*:[fr]
+news/*/.news-*:[fr]
+news/nl/nl-*:[fr]
+news/nl/.nl-*:[fr]
+events/*/event-*:[fr]
--- a/index.sources
+++ b/index.sources
@ -1,7 +1,7 @@
-news/$thisyear/news:[frontpage]
-news/$lastyear/news:[frontpage]
-news/$thisyear/.news:[frontpage]
-news/$lastyear/.news:[frontpage]
-events/$thisyear/event:[frontpage]
-tools/frontpage/:[]
-tools/static-elements/element-:[]
+news/$thisyear/news-*:[frontpage]
+news/$lastyear/news-*:[frontpage]
+news/$thisyear/.news-*:[frontpage]
+news/$lastyear/.news-*:[frontpage]
+events/$thisyear/event-*:[frontpage]
+tools/frontpage/*:[]
+tools/static-elements/element-*:[]
--- a/it/it.sources
+++ b/it/it.sources
@ -1,16 +1,15 @@
 about/people/people:[]
-about/people/employee:[]
+about/people/employees:[]
 about/people/functions:[]
-about/people/function-:[]
+about/people/function-*:[]
 about/people/countries:[]
 about/people/groups:[]
 about/people/volunteers:[]
 activities/*/project:[]
 campaigns/*/project:[]
-contact/local:[]

-news/*/news:[it]
-news/*/.news:[it]
-news/nl/nl:[it]
-news/nl/.nl:[it]
-events/*/event:[it]
+news/*/news-*:[it]
+news/*/.news-*:[it]
+news/nl/nl-*:[it]
+news/nl/.nl-*:[it]
+events/*/event-*:[it]
--- a/news/legal-news.sources
+++ b/news/legal-news.sources
@ -1,2 +1,2 @@
-news/*/news:[legalnews]
-news/*/.news:[legalnews]
+news/*/news-*:[legalnews]
+news/*/.news-*:[legalnews]
--- a/news/news.sources
+++ b/news/news.sources
@ -1,9 +1,9 @@
-news/$thisyear/news:[]
-news/$lastyear/news:[]
-news/$thisyear/.news:[]
-news/$lastyear/.news:[]
-news/nl/nl-$thisyear:[]
-news/nl/nl-$lastyear:[]
-news/nl/.nl-$thisyear:[]
-news/nl/.nl-$lastyear:[]
-tools/static-elements/element-:[]
+news/$thisyear/news-*:[]
+news/$lastyear/news-*:[]
+news/$thisyear/.news-*:[]
+news/$lastyear/.news-*:[]
+news/nl/nl-$thisyear*:[]
+news/nl/nl-$lastyear*:[]
+news/nl/.nl-$thisyear*:[]
+news/nl/.nl-$lastyear*:[]
+tools/static-elements/element-*:[]
--- a/news/newsletter.sources
+++ b/news/newsletter.sources
@ -1,2 +1,2 @@
-news/nl/nl:[]
-news/nl/.nl:[]
+news/nl/nl-*:[]
+news/nl/.nl-*:[]
--- a/pdfreaders/pdfreaders.sources
+++ b/pdfreaders/pdfreaders.sources
@ -1 +1 @@
-pdfreaders/readers/:[]
+pdfreaders/readers/*:[]
--- a/press/press.sources
+++ b/press/press.sources
@ -1,4 +1,4 @@
-news/*/news:[]
-news/*/.news:[]
-news/nl/nl:[]
-news/nl/.nl:[]
+news/*/news-*:[]
+news/*/.news-*:[]
+news/nl/nl-*:[]
+news/nl/.nl-*:[]
--- a/supporter/testimonials.sources
+++ b/supporter/testimonials.sources
@ -1 +1 @@
-supporter/testimonials/:[]
+supporter/testimonials/*:[]
--- a/tags/tags.sources
+++ b/tags/tags.sources
@ -1,5 +1,5 @@
-news/*/news:[]
-news/*/.news:[]
-news/nl/nl:[]
-news/nl/.nl:[]
-events/*/event:[]
+news/*/news-*:[]
+news/*/.news-*:[]
+news/nl/nl-*:[]
+news/nl/.nl-*:[]
+events/*/event-*:[]
--- a/tools/update_xmllists.sh
+++ b/tools/update_xmllists.sh
@ -122,7 +122,7 @@ for source_file in $(find * -name '*.sources' | sort); do
      cat "tags/.tagged-${tag}.xmllist"
    else
      echo "${all_xml}"
-    fi | grep "^${pattern}" || true
+    fi | grep "^${pattern}\$" || true
  done | sort -u > "/tmp/xmllist-${pid}"

  list_file="$(dirname ${source_file})/.$(basename ${source_file} .sources).xmllist"
--- a/uk/uk.sources
+++ b/uk/uk.sources
@ -1,16 +1,15 @@
 about/people/people:[]
-about/people/employee:[]
+about/people/employees:[]
 about/people/functions:[]
-about/people/function-:[]
+about/people/function-*:[]
 about/people/countries:[]
 about/people/groups:[]
 about/people/volunteers:[]
 activities/*/project:[]
 campaigns/*/project:[]
-contact/local:[]

-news/*/news:[gb]
-news/*/.news:[gb]
-news/nl/nl:[gb]
-news/nl/.nl:[gb]
-events/*/event:[gb]
+news/*/news-*:[gb]
+news/*/.news-*:[gb]
+news/nl/nl-*:[gb]
+news/nl/.nl-*:[gb]
+events/*/event-*:[gb]