Merge branch 'rewrite-gitlab-repo-urls' into 'master'

rewrite gitlab repo URLs

See merge request fdroid/fdroiddata!5605

metadata/com.alaskalinuxuser.criticalvelocity.yml

@@ -17,7 +17,7 @@ Description: |-
     more difficult! Can you make it, Captain?
 
 RepoType: git
-Repo: https://gitlab.com/alaskalinuxuser/app_critical_velocity
+Repo: https://gitlab.com/alaskalinuxuser/app_critical_velocity.git
 
 Builds:
   - versionName: '1.0'

metadata/com.alaskalinuxuser.hourglass.yml

@@ -18,7 +18,7 @@ Description: |-
     that require timers!
 
 RepoType: git
-Repo: https://gitlab.com/alaskalinuxuser/app_hourglass
+Repo: https://gitlab.com/alaskalinuxuser/app_hourglass.git
 
 Builds:
   - versionName: '1.0'

metadata/com.alaskalinuxuser.justcraigslist.yml

@@ -15,7 +15,7 @@ Description: |-
     controls, this helps you focus on what is really important: the posts!
 
 RepoType: git
-Repo: https://gitlab.com/alaskalinuxuser/app_justcraigslist
+Repo: https://gitlab.com/alaskalinuxuser/app_justcraigslist.git
 
 Builds:
   - versionName: '1.1'

metadata/com.alaskalinuxuser.justnotes.yml

@@ -20,7 +20,7 @@ Description: |-
     apps and "small" apps for easy to understand and usable code.
 
 RepoType: git
-Repo: https://gitlab.com/alaskalinuxuser/app_justnotes
+Repo: https://gitlab.com/alaskalinuxuser/app_justnotes.git
 
 Builds:
   - versionName: '1.0'

metadata/com.alaskalinuxuser.rilcontrol.yml

@@ -19,7 +19,7 @@ Description: |-
 RequiresRoot: 'True'
 
 RepoType: git
-Repo: https://gitlab.com/alaskalinuxuser/app_ril_control
+Repo: https://gitlab.com/alaskalinuxuser/app_ril_control.git
 
 Builds:
   - versionName: '1.0'

metadata/com.alaskalinuxuser.shipcaptainandcrew.yml

@@ -23,7 +23,7 @@ Description: |-
     strike "midnight"!
 
 RepoType: git
-Repo: https://gitlab.com/alaskalinuxuser/app_ship_capt_crew
+Repo: https://gitlab.com/alaskalinuxuser/app_ship_capt_crew.git
 
 Builds:
   - versionName: '1.3'

metadata/com.example.harisont.librery.yml

@@ -18,7 +18,7 @@ Description: |-
     * Available in English and Italian
 
 RepoType: git
-Repo: https://gitlab.com/harisont/Librery
+Repo: https://gitlab.com/harisont/Librery.git
 
 Builds:
   - versionName: '3.0'

metadata/com.github.axet.filemanager.yml

@@ -18,7 +18,7 @@ Description: |-
     * root capabilities (enable in settings if your device is rooted)
 
 RepoType: git
-Repo: https://gitlab.com/axet/android-file-manager
+Repo: https://gitlab.com/axet/android-file-manager.git
 
 Builds:
   - versionName: 0.2.58

metadata/com.halftough.webcomreader.yml

@@ -21,7 +21,7 @@ Description: |-
     * [https://www.peppercarrot.com/ Pepper & Carrot]
 
 RepoType: git
-Repo: https://gitlab.com/halftough/webcom-reader
+Repo: https://gitlab.com/halftough/webcom-reader.git
 
 Builds:
   - versionName: 0.2.0

metadata/com.jonbanjo.cupsprintservice.yml

@@ -13,7 +13,7 @@ Description: |-
     WARNING: This app is no longer maintained.
 
 RepoType: git
-Repo: https://gitlab.com/krt/jfcups-service
+Repo: https://gitlab.com/krt/jfcups-service.git
 
 Builds:
   - versionName: '0.23'

metadata/com.kunzisoft.keyboard.switcher.yml

@@ -14,7 +14,7 @@ Litecoin: LRmhvGbKNXFLTxyK8Q9zBxDXjBWm6Rzt34
 AutoName: Keyboard Switcher
 
 RepoType: git
-Repo: https://gitlab.com/kunzisoft/Android-KeyboardSwitcher
+Repo: https://gitlab.com/kunzisoft/Android-KeyboardSwitcher.git
 
 Builds:
   - versionName: '1.0'

metadata/com.orpheusdroid.screenrecorder.yml

@@ -33,7 +33,7 @@ Description: |-
     [https://gitlab.com/vijai/screenrecorder/issues/72#note_180392881 here]
 
 RepoType: git
-Repo: https://gitlab.com/vijai/screenrecorder
+Repo: https://gitlab.com/vijai/screenrecorder.git
 
 Builds:
   - versionName: '1.1'

metadata/com.orpheusdroid.sqliteviewer.yml

@@ -24,7 +24,7 @@ Description: |-
     * READ_EXTERNAL_STORAGE, WRITE_EXTERNAL_STORAGE - For opening databases from storage or writing exported csv file
 
 RepoType: git
-Repo: https://gitlab.com/vijai/SqliteDBViewer
+Repo: https://gitlab.com/vijai/SqliteDBViewer.git
 
 Builds:
   - versionName: 1.0.0

metadata/com.sunyata.kindmind.yml

@@ -15,7 +15,7 @@ Description: |-
     chosen together so that the sorting improves as the app is used.
 
 RepoType: git
-Repo: https://gitlab.com/SunyataZero/kindmind
+Repo: https://gitlab.com/SunyataZero/kindmind.git
 
 Builds:
   - versionName: 1.0.0_BETA

metadata/com.termoneplus.yml

@@ -16,7 +16,7 @@ Description: |-
     This application is a clone of Jack Palevich's [[jackpal.androidterm]].
 
 RepoType: git
-Repo: https://gitlab.com/termapps/termoneplus
+Repo: https://gitlab.com/termapps/termoneplus.git
 
 Builds:
   - versionName: 3.0.0

metadata/daniel_32.flexiblewallpaper.yml

@@ -22,7 +22,7 @@ Description: |-
     nothing that I can do about it.
 
 RepoType: git
-Repo: https://gitlab.com/danielmeek32/FlexibleWallpaper
+Repo: https://gitlab.com/danielmeek32/FlexibleWallpaper.git
 
 Builds:
   - versionName: '1.0'

metadata/de.HS_Aalen.don.yml

@@ -9,7 +9,7 @@ Changelog: https://gitlab.com/HS_Aalen_RN/Aalener_Optik-Formelrechner/tags
 AutoName: Aalener Optik-Formelrechner
 
 RepoType: git
-Repo: https://gitlab.com/HS_Aalen_RN/Aalener_Optik-Formelrechner
+Repo: https://gitlab.com/HS_Aalen_RN/Aalener_Optik-Formelrechner.git
 
 Builds:
   - versionName: '1.10'

metadata/de.bloosberg.basti.childresuscalc.yml

@@ -8,7 +8,7 @@ Changelog: https://gitlab.com/bloosberg/child-resus-calc/blob/HEAD/CHANGELOG
 AutoName: Child Resus Calc
 
 RepoType: git
-Repo: https://gitlab.com/bloosberg/child-resus-calc
+Repo: https://gitlab.com/bloosberg/child-resus-calc.git
 
 Builds:
   - versionName: '1.0'

metadata/de.drhoffmannsoftware.calcvac.yml

@@ -15,7 +15,7 @@ Description: |-
     simulated. Finally the pipes can be linked together to form a network.
 
 RepoType: git
-Repo: https://gitlab.com/kollo/Calcvac-Android
+Repo: https://gitlab.com/kollo/Calcvac-Android.git
 
 Builds:
   - versionName: 2.01-1

metadata/de.freifunk_karte.freifunk_karte.yml

@@ -16,7 +16,7 @@ Description: |-
     freifunk-karte.de
 
 RepoType: git
-Repo: https://gitlab.com/TheRMaverick/Freifunk-Karte
+Repo: https://gitlab.com/TheRMaverick/Freifunk-Karte.git
 
 Builds:
   - versionName: '1.4'

metadata/dk.kjeldsen.carwingsflutter.yml

@@ -18,7 +18,7 @@ Description: |-
     location of the vehicle.
 
 RepoType: git
-Repo: https://gitlab.com/tobiaswkjeldsen/carwingsflutter
+Repo: https://gitlab.com/tobiaswkjeldsen/carwingsflutter.git
 
 Builds:
   - versionName: 1.5.2

metadata/fr.jnda.android.ipcalc.yml

@@ -8,7 +8,7 @@ Changelog: https://gitlab.com/jnda/IPCalc/blob/HEAD/CHANGELOG
 AutoName: IPCalc
 
 RepoType: git
-Repo: https://gitlab.com/jnda/IPCalc
+Repo: https://gitlab.com/jnda/IPCalc.git
 
 Builds:
   - versionName: '1.4'

metadata/freemap.opentrail.yml

@@ -15,7 +15,7 @@ Description: |-
     routes.
 
 RepoType: git
-Repo: https://gitlab.com/nickw1/opentrail
+Repo: https://gitlab.com/nickw1/opentrail.git
 
 Builds:
   - versionName: '0.4'

metadata/info.guardianproject.locationprivacy.yml

@@ -48,7 +48,8 @@ Builds:
     commit: 0.3.1
     timeout: 2000
     subdir: app
-    sudo: apt-get -qy install --no-install-recommends -t stretch-backports diffoscope apktool enjarify unzip xxd
+    sudo: apt-get -qy install --no-install-recommends -t stretch-backports diffoscope
+        apktool enjarify unzip xxd
     gradle:
       - yes
     prebuild: echo 'android.lintOptions.checkReleaseBuilds false' >> build.gradle

metadata/it.alessandropira.wesnoth114.yml

@@ -17,7 +17,7 @@ Description: |-
     evil.
 
 RepoType: git
-Repo: https://gitlab.com/f-droid-mirrors/empty
+Repo: https://gitlab.com/f-droid-mirrors/empty.git
 
 Builds:
   - versionName: 1.14.5-53

metadata/net.eneiluj.moneybuster.yml

@@ -13,7 +13,7 @@ LiberapayID: '1520530'
 AutoName: MoneyBuster
 
 RepoType: git
-Repo: https://gitlab.com/eneiluj/moneybuster
+Repo: https://gitlab.com/eneiluj/moneybuster.git
 
 Builds:
   - versionName: 0.0.4

metadata/net.eneiluj.nextcloud.phonetrack.yml

@@ -13,7 +13,7 @@ LiberapayID: '1520530'
 AutoName: PhoneTrack
 
 RepoType: git
-Repo: https://gitlab.com/eneiluj/phonetrack-android
+Repo: https://gitlab.com/eneiluj/phonetrack-android.git
 
 Builds:
   - versionName: 0.0.1

metadata/net.khertan.forrunners.yml

@@ -21,7 +21,7 @@ Description: |-
     * Record equipment usage
 
 RepoType: git
-Repo: https://gitlab.com/brvier/ForRunners
+Repo: https://gitlab.com/brvier/ForRunners.git
 
 Builds:
   - versionName: 1.1.1

metadata/net.osmand.plus.yml

@@ -16,7 +16,7 @@ Bitcoin: 1GRgEnKujorJJ9VBa76g8cp3sfoWtQqSs4
 Name: OsmAnd~
 
 RepoType: git
-Repo: https://gitlab.com/f-droid-mirrors/OsmAnd-submodules
+Repo: https://gitlab.com/f-droid-mirrors/OsmAnd-submodules.git
 
 Builds:
   - versionName: 1.8.2

metadata/org.droidtr.deletegapps.yml

@@ -27,7 +27,7 @@ Description: |-
 RequiresRoot: 'yes'
 
 RepoType: git
-Repo: https://gitlab.com/sulincix/disable-delete-gapps
+Repo: https://gitlab.com/sulincix/disable-delete-gapps.git
 
 Builds:
   - versionName: '2.0'

metadata/org.droidtr.keyboard.yml

@@ -27,7 +27,7 @@ Description: |-
     * Standard structure
 
 RepoType: git
-Repo: https://gitlab.com/droidtr/org.droidtr.keyboard
+Repo: https://gitlab.com/droidtr/org.droidtr.keyboard.git
 
 Builds:
   - versionName: '5.5'

metadata/org.droidtr.termbin.yml

@@ -14,7 +14,7 @@ Description: |-
     [https://termbin.com/] for additional details.
 
 RepoType: git
-Repo: https://gitlab.com/droidtr/termbin-client
+Repo: https://gitlab.com/droidtr/termbin-client.git
 
 Builds:
   - versionName: '1.1'

metadata/org.fdroid.fdroid.ota.yml

@@ -14,7 +14,7 @@ Bitcoin: 15u8aAPK4jJ5N8wpWJ5gutAyyeHtKX5i18
 AutoName: F-Droid OTA
 
 RepoType: git
-Repo: https://gitlab.com/fdroid/fdroidclient
+Repo: https://gitlab.com/fdroid/fdroidclient.git
 
 Builds:
   - versionName: 1.0.3

metadata/org.glucosio.android.yml

@@ -32,7 +32,7 @@ Description: |-
     * Support for Android 7.1 shortcuts
 
 RepoType: git
-Repo: https://gitlab.com/glucosio/glucosio-android
+Repo: https://gitlab.com/glucosio/glucosio-android.git
 
 Builds:
   - versionName: '1.0'

metadata/org.horaapps.leafpic.yml

@@ -17,7 +17,7 @@ Description: |-
     useful features.
 
 RepoType: git
-Repo: https://gitlab.com/HoraApps/LeafPic
+Repo: https://gitlab.com/HoraApps/LeafPic.git
 
 Builds:
   - versionName: v0.5.2

metadata/org.jschwab.openrecipes.yml

@@ -15,7 +15,7 @@ Description: |-
     synchronize your recipes between devices (mobile and desktop) and share them with your friends.
 
 RepoType: git
-Repo: https://gitlab.com/ddorian/openrecipes/
+Repo: https://gitlab.com/ddorian/openrecipes.git
 
 Builds:
   - versionName: 0.2.1

metadata/org.nuntius35.wrongpinshutdown.yml

@@ -10,7 +10,7 @@ AutoName: Wrong PIN Shutdown
 RequiresRoot: 'yes'
 
 RepoType: git
-Repo: https://gitlab.com/nuntius35/wps
+Repo: https://gitlab.com/nuntius35/wps.git
 
 Builds:
   - versionName: '1.0'

metadata/org.proninyaroslav.libretorrent.yml

@@ -36,7 +36,7 @@ Description: |-
     * And more
 
 RepoType: git
-Repo: https://gitlab.com/proninyaroslav/libretorrent
+Repo: https://gitlab.com/proninyaroslav/libretorrent.git
 
 Builds:
   - versionName: '1.0'

metadata/org.schabi.etherwake.yml

@@ -13,7 +13,7 @@ Description: |-
 RequiresRoot: 'yes'
 
 RepoType: git
-Repo: https://gitlab.com/derSchabi/Etherwake-app
+Repo: https://gitlab.com/derSchabi/Etherwake-app.git
 
 Builds:
   - versionName: '1.0'

metadata/org.schabi.nxbookmarks.owncloud.yml

@@ -21,7 +21,7 @@ Description: |-
     '''Note:''' this app is currently unmaintained and looking for a new maintainer.
 
 RepoType: git
-Repo: https://gitlab.com/derSchabi/OCBookmarks
+Repo: https://gitlab.com/derSchabi/OCBookmarks.git
 
 Builds:
   - versionName: '1.1'

metadata/org.schabi.nxbookmarks.yml

@@ -21,7 +21,7 @@ Description: |-
     '''Note:''' this app is currently unmaintained and looking for a new maintainer.
 
 RepoType: git
-Repo: https://gitlab.com/derSchabi/OCBookmarks
+Repo: https://gitlab.com/derSchabi/OCBookmarks.git
 
 Builds:
   - versionName: '1.0'

metadata/org.schabi.terminightor.yml

@@ -23,7 +23,7 @@ Description: |-
     * put alarms off via NFC tag
 
 RepoType: git
-Repo: https://gitlab.com/derSchabi/Terminightor
+Repo: https://gitlab.com/derSchabi/Terminightor.git
 
 Builds:
   - versionName: '0.8'

metadata/player.efis.cfd.yml

@@ -71,7 +71,7 @@ Description: |-
     '''Screenshots''' [http://members.iinet.net.au/~ninelima/efis/gallery.html]
 
 RepoType: git
-Repo: https://gitlab.com/ninelima/kwikEFIS
+Repo: https://gitlab.com/ninelima/kwikEFIS.git
 
 Builds:
   - versionName: '1.0'

metadata/player.efis.data.eur.rus.yml

@@ -20,7 +20,7 @@ Description: |-
     * [http://members.iinet.net.au/~ninelima/efis/datapac.html Screenshots]
 
 RepoType: git
-Repo: https://gitlab.com/ninelima/kwikEFIS
+Repo: https://gitlab.com/ninelima/kwikEFIS.git
 
 Builds:
   - versionName: '1.0'

metadata/player.efis.data.pan.arg.yml

@@ -18,7 +18,7 @@ Description: |-
     * [http://members.iinet.net.au/~ninelima/efis/datapac.html Screenshots]
 
 RepoType: git
-Repo: https://gitlab.com/ninelima/kwikEFIS
+Repo: https://gitlab.com/ninelima/kwikEFIS.git
 
 Builds:
   - versionName: '1.2'

metadata/player.efis.data.sah.jap.yml

@@ -22,7 +22,7 @@ Description: |-
     * [http://members.iinet.net.au/~ninelima/efis/datapac.html Screenshots]
 
 RepoType: git
-Repo: https://gitlab.com/ninelima/kwikEFIS
+Repo: https://gitlab.com/ninelima/kwikEFIS.git
 
 Builds:
   - versionName: '1.2'

metadata/player.efis.data.usa.can.yml

@@ -20,7 +20,7 @@ Description: |-
     * [http://members.iinet.net.au/~ninelima/efis/datapac.html Screenshots]
 
 RepoType: git
-Repo: https://gitlab.com/ninelima/kwikEFIS
+Repo: https://gitlab.com/ninelima/kwikEFIS.git
 
 Builds:
   - versionName: '1.2'

metadata/player.efis.data.zar.aus.yml

@@ -20,7 +20,7 @@ Description: |-
     * [http://members.iinet.net.au/~ninelima/efis/datapac.html Screenshots]
 
 RepoType: git
-Repo: https://gitlab.com/ninelima/kwikEFIS
+Repo: https://gitlab.com/ninelima/kwikEFIS.git
 
 Builds:
   - versionName: '1.2'

metadata/player.efis.mfd.yml

@@ -57,7 +57,7 @@ Description: |-
     '''Screenshots''' [http://members.iinet.net.au/~ninelima/efis/gallery.html]
 
 RepoType: git
-Repo: https://gitlab.com/ninelima/kwikEFIS
+Repo: https://gitlab.com/ninelima/kwikEFIS.git
 
 Builds:
   - versionName: '1.0'

metadata/player.efis.pfd.yml

@@ -54,7 +54,7 @@ Description: |-
     '''Screenshots''' [http://members.iinet.net.au/~ninelima/efis/gallery.html]
 
 RepoType: git
-Repo: https://gitlab.com/ninelima/kwikEFIS
+Repo: https://gitlab.com/ninelima/kwikEFIS.git
 
 Builds:
   - versionName: 2.2.0

metadata/science.iodev.fissh.yml

@@ -15,7 +15,7 @@ Description: |-
     * It is important to note that none of the FiSSH apps have access to private key file and that FiSSH uses TLS sockets with certificate validation to prevent man-in-the-middle attacks!
 
 RepoType: git
-Repo: https://gitlab.com/ioanm/FiSSH-App
+Repo: https://gitlab.com/ioanm/FiSSH-App.git
 
 Builds:
   - versionName: '2.5'

metadata/sh.ftp.rocketninelabs.meditationassistant.opensource.yml

@@ -28,7 +28,7 @@ Description: |-
     minutes out of your schedule.
 
 RepoType: git
-Repo: https://gitlab.com/tslocum/meditationassistant
+Repo: https://gitlab.com/tslocum/meditationassistant.git
 
 Builds:
   - versionName: 1.2.7

metadata/space.neothefox.laytray.yml

@@ -19,7 +19,7 @@ Description: |-
     WORK.
 
 RepoType: git
-Repo: https://gitlab.com/neothefox/LayTray
+Repo: https://gitlab.com/neothefox/LayTray.git
 
 Builds:
   - versionName: '1.6'

metadata/superustats.tool.android.yml

@@ -7,7 +7,7 @@ IssueTracker: https://gitlab.com/superustats/superustats/issues
 AutoName: SuperUStats
 
 RepoType: git
-Repo: https://gitlab.com/superustats/superustats
+Repo: https://gitlab.com/superustats/superustats.git
 
 Builds:
   - versionName: '1.0'

metadata/taco.apkmirror.yml

@@ -33,7 +33,7 @@ Description: |-
     Remember that they show ads to be able to keep their site up, so try not to think too harshly of them.
 
 RepoType: git
-Repo: https://gitlab.com/TacoTheDank/APKMirror
+Repo: https://gitlab.com/TacoTheDank/APKMirror.git
 
 Builds:
   - versionName: 1.0.4

metadata/tk.giesecke.painlessmesh.yml

@@ -18,7 +18,7 @@ Description: |-
     permission from the user to be able to scan for Wi-Fi networks.
 
 RepoType: git
-Repo: https://gitlab.com/beegee1962/painlessmesh_android
+Repo: https://gitlab.com/beegee1962/painlessmesh_android.git
 
 Builds:
   - versionName: '1.4'

metadata/x653.all_in_gold.yml

@@ -7,7 +7,7 @@ IssueTracker: https://gitlab.com/x653/all_in_gold/issues
 AutoName: All In Gold
 
 RepoType: git
-Repo: https://gitlab.com/x653/all_in_gold
+Repo: https://gitlab.com/x653/all_in_gold.git
 
 Builds:
   - versionName: '1.2'

metadata/x653.bullseye.yml

@@ -7,7 +7,7 @@ IssueTracker: https://gitlab.com/x653/bullseye/issues
 AutoName: Bullseye
 
 RepoType: git
-Repo: https://gitlab.com/x653/bullseye
+Repo: https://gitlab.com/x653/bullseye.git
 
 Builds:
   - versionName: '0.1'

tools/rewrite-git-redirects.py

@@ -0,0 +1,33 @@
+#!/usr/bin/env python3
+#
+#
+# GitLab gives a warning every time if the git URL is redirected.  So this
+# rewrites all GitLab URLs so they are no longer a redirect.
+
+import glob
+import os
+import re
+import sys
+import yaml
+
+os.chdir(os.path.dirname(__file__) + '/../')
+
+if len(sys.argv) > 1:
+    files = sys.argv[1:]
+else:
+    files = sorted(glob.glob('metadata/*.yml'))
+
+pattern = re.compile(r'Repo: .*')
+for f in files:
+    with open(f) as fp:
+        data = yaml.load(fp)
+    repo_url = None
+    if 'Repo' in data:
+        repo_url = data['Repo'].strip().rstrip('/')
+    if repo_url and not repo_url.endswith('.git') and repo_url.startswith('https://gitlab'):
+        new_url = repo_url + '.git'
+        print("Repo:", data['Repo'], "\n -->  " + new_url + "'")
+        with open(f) as fp:
+            raw = fp.read()
+        with open(f, 'w') as fp:
+            fp.write(pattern.sub('Repo: ' + new_url, raw))