Move FOSS repo to match fdroid path convention

Fixes mollyim/mollyim-android#40
2025-05-12 21:20:38 +01:00 · 2021-06-15 12:27:06 +02:00 · 2021-06-15 12:27:06 +02:00 · 8575d1c2df
commit 8575d1c2df
parent e9167922c2
41 changed files with 16 additions and 15 deletions
--- a/foss/fdroid/repo/categories.txt
+++ b/foss/fdroid/repo/categories.txt
--- a/foss/fdroid/repo/icons-120/im.molly.app.79800.png
+++ b/foss/fdroid/repo/icons-120/im.molly.app.79800.png
--- a/foss/fdroid/repo/icons-120/im.molly.app.80805.png
+++ b/foss/fdroid/repo/icons-120/im.molly.app.80805.png
--- a/foss/fdroid/repo/icons-120/im.molly.app.82600.png
+++ b/foss/fdroid/repo/icons-120/im.molly.app.82600.png
--- a/foss/fdroid/repo/icons-120/im.molly.app.84100.png
+++ b/foss/fdroid/repo/icons-120/im.molly.app.84100.png
--- a/foss/fdroid/repo/icons-160/im.molly.app.80805.png
+++ b/foss/fdroid/repo/icons-160/im.molly.app.80805.png
--- a/foss/fdroid/repo/icons-160/im.molly.app.82600.png
+++ b/foss/fdroid/repo/icons-160/im.molly.app.82600.png
--- a/foss/fdroid/repo/icons-160/im.molly.app.84100.png
+++ b/foss/fdroid/repo/icons-160/im.molly.app.84100.png
--- a/foss/fdroid/repo/icons-240/im.molly.app.80805.png
+++ b/foss/fdroid/repo/icons-240/im.molly.app.80805.png
--- a/foss/fdroid/repo/icons-240/im.molly.app.82600.png
+++ b/foss/fdroid/repo/icons-240/im.molly.app.82600.png
--- a/foss/fdroid/repo/icons-240/im.molly.app.84100.png
+++ b/foss/fdroid/repo/icons-240/im.molly.app.84100.png
--- a/foss/fdroid/repo/icons-320/im.molly.app.80805.png
+++ b/foss/fdroid/repo/icons-320/im.molly.app.80805.png
--- a/foss/fdroid/repo/icons-320/im.molly.app.82600.png
+++ b/foss/fdroid/repo/icons-320/im.molly.app.82600.png
--- a/foss/fdroid/repo/icons-320/im.molly.app.84100.png
+++ b/foss/fdroid/repo/icons-320/im.molly.app.84100.png
--- a/foss/fdroid/repo/icons-480/im.molly.app.80805.png
+++ b/foss/fdroid/repo/icons-480/im.molly.app.80805.png
--- a/foss/fdroid/repo/icons-480/im.molly.app.82600.png
+++ b/foss/fdroid/repo/icons-480/im.molly.app.82600.png
--- a/foss/fdroid/repo/icons-480/im.molly.app.84100.png
+++ b/foss/fdroid/repo/icons-480/im.molly.app.84100.png
--- a/foss/fdroid/repo/icons-640/im.molly.app.80805.png
+++ b/foss/fdroid/repo/icons-640/im.molly.app.80805.png
--- a/foss/fdroid/repo/icons-640/im.molly.app.82600.png
+++ b/foss/fdroid/repo/icons-640/im.molly.app.82600.png
--- a/foss/fdroid/repo/icons-640/im.molly.app.84100.png
+++ b/foss/fdroid/repo/icons-640/im.molly.app.84100.png
--- a/foss/fdroid/repo/icons/im.molly.app.80805.png
+++ b/foss/fdroid/repo/icons/im.molly.app.80805.png
--- a/foss/fdroid/repo/icons/im.molly.app.80805.xml
+++ b/foss/fdroid/repo/icons/im.molly.app.80805.xml
--- a/foss/fdroid/repo/icons/im.molly.app.82600.png
+++ b/foss/fdroid/repo/icons/im.molly.app.82600.png
--- a/foss/fdroid/repo/icons/im.molly.app.82600.xml
+++ b/foss/fdroid/repo/icons/im.molly.app.82600.xml
--- a/foss/fdroid/repo/icons/im.molly.app.84100.png
+++ b/foss/fdroid/repo/icons/im.molly.app.84100.png
--- a/foss/fdroid/repo/icons/im.molly.app.84100.xml
+++ b/foss/fdroid/repo/icons/im.molly.app.84100.xml
--- a/foss/fdroid/repo/icons/molly-icon.png
+++ b/foss/fdroid/repo/icons/molly-icon.png
--- a/foss/fdroid/repo/im.molly.app_80805.apk
+++ b/foss/fdroid/repo/im.molly.app_80805.apk
--- a/foss/fdroid/repo/im.molly.app_82600.apk
+++ b/foss/fdroid/repo/im.molly.app_82600.apk
--- a/foss/fdroid/repo/im.molly.app_84100.apk
+++ b/foss/fdroid/repo/im.molly.app_84100.apk
--- a/foss/fdroid/repo/index-v1.jar
+++ b/foss/fdroid/repo/index-v1.jar
--- a/foss/fdroid/repo/index-v1.json
+++ b/foss/fdroid/repo/index-v1.json
@ -1,10 +1,10 @@
 {
  "repo": {
-    "timestamp": 1621466166000,
+    "timestamp": 1623754603000,
    "version": 21,
    "name": "Molly F-Droid Repo (FOSS)",
    "icon": "molly-icon.png",
-    "address": "https://molly.im/fdroid/foss/repo",
+    "address": "https://molly.im/fdroid/foss/fdroid/repo",
    "description": "The official repository of Molly for use with the F-Droid client. Applications in this repository are the same signed binaries that are released on GitHub. "
  },
  "requests": {
--- a/foss/fdroid/repo/index.html
+++ b/foss/fdroid/repo/index.html
@ -0,0 +1,9 @@
+<html lang="en">
+  <head>
+    <meta charset="UTF-8">
+    <title>Molly F-Droid Repo (FOSS)</title>
+  </head>
+  <body>
+    This <a href="https://molly.im/fdroid/foss/fdroid/repo?fingerprint=5198DAEF37FC23C14D5EE32305B2AF45787BD7DF2034DE33AD302BDB3446DF74">URL</a> is to be used with F-Droid app. Go <a href="/fdroid">here</a> to the repo overview page.
+  </body>
+</html>
--- a/foss/fdroid/repo/index.jar
+++ b/foss/fdroid/repo/index.jar
--- a/foss/fdroid/repo/index.xml
+++ b/foss/fdroid/repo/index.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <fdroid>
-	<repo icon="molly-icon.png" name="Molly F-Droid Repo (FOSS)" pubkey="3082053130820319a00302010202044598b6a0300d06092a864886f70d01010b050030493120301e060355040a13174d6f6c6c7920496e7374616e74204d657373656e6765723110300e060355040b1307462d44726f6964311330110603550403130a4f73636172204d697261301e170d3230313031333032353534395a170d3438303232393032353534395a30493120301e060355040a13174d6f6c6c7920496e7374616e74204d657373656e6765723110300e060355040b1307462d44726f6964311330110603550403130a4f73636172204d69726130820222300d06092a864886f70d01010105000382020f003082020a0282020100b249333b8017c58c84c6341e510637936bec51e7f36b1127b882020a2a9b8007abba407c12628b9156416f69850ebba9f1ba881d827a8874a018ac1efaac22ce9f07ee8a414df027410d6a8359b6799b764fb0e7a13339348d34f6a697dc7ff79f2e6cbfbda8213d243b265792ec6478aefd310c395494d245b6038a836d13f290ef3f3cba10d507456413294a0ad6eb9b1852605c93c00b14ba9d4c42fa7b72dbe3f492b412d39e45cf3a75a2c8bcb27c0c81cf49a626f1f0972c31967a785accc49a4992bbbaec5060659ed17a533a09071da00b37bd617f901027951d292cdc3bda63e2778ea458b3a243df3ade6e25a662bf1d0e1f8966a2bec405bab4829f954a624206ccbbbaed02556eb2fddf48238e50380be56c1ba1defc42b1ba958de355f12a35c0f4f679ffe3b0a7b027092c47c2d672dd6ab19c2cb23b58dcc3fa7a4a904d39d2ac7eac8e2e239bfd3688c2f59f9cb80f2174c0165582c1003a7ab2006df4f3216a635b30e9a2bbb062b07c81656063006fc126ffb4c8a9c64674f186dd480be8216d16e5ab2d03092166a2f64f1dbae0c564a55c9b77a157e69957454f4d4a62cc9368964679c36f0b187cb00239444210e1ec7d51d45bbfbdf96701d3df20fb51affbf891cb1bd65fd917c15a9999c56322c41c70ab2f0b821bc8977f5bc69de392e7a7977d5f2ff83282576cf7927ba2a1111d9f0c6b0f210203010001a321301f301d0603551d0e04160414d3ee008c3f0af19fa46528e17691c4cc6657b9fd300d06092a864886f70d01010b0500038202010030b9226f391f9df96fbea9fd8111b1bf3dd1b2947a6dc2044fdff7c3b7c261557d4d2e8dc398b5ed0a7bc5b666a2f894c40a4a156e4412720a6219a445aec6074bbd2378a0b82d46d245318b954d0841a4e5909c259871fcd93941fcae7b4a8f884b55bdc3a0af57caa5797fbf1e26ed625cb1e03a6b47e31d0c6afb447804f2de605facf3d0c35f4e410d3a59706a482831cf7ab72057363848919a2f854ae3279fcc246277f3493f3b88cac12bb6500d63981d2fe2126579e931b3882879a8df2404d36b415887b652402c70d5eeba627f96a1ea2e095e60e55d5d3e678516551e501eb2d675b2cc7fe9b9d3e923e411b773fb8f643855ddf1f09bae72f6d0c27925e3c245ef7bb665bb0ee531ad4fb3fec9f0f54d016e4111fecbd613c1ea4bad69a385c6c90706c6bdeaad2f08292594e951ef7a729eda3f7b8a1959b2d49fc032eab02e097b482bb85577e27a6700ac188be4581d5b0e27b4f1b22dc0c44b45e4dd2acd3934b8dd557106fc9bf0a2402ad2e72d43a090a4a4fb2ccd5fc3f0add400f91b9e22a5740cc27a1d494b651456a871dfece9aa35366f2fae1905f41c3b04dca0386889507f57c1e3eff05f30cb87e38d1d1f45c2c05815bde12f11225c22467e6ea5af04c1f3f1a0d60592c701f7ea00e809bc46f92759949a57294d13e6bad30cb31f111ace4433a634e407684282e127a67aa346487ca49b85" timestamp="1621466166" url="https://molly.im/fdroid/foss/repo" version="21">
+	<repo icon="molly-icon.png" name="Molly F-Droid Repo (FOSS)" pubkey="3082053130820319a00302010202044598b6a0300d06092a864886f70d01010b050030493120301e060355040a13174d6f6c6c7920496e7374616e74204d657373656e6765723110300e060355040b1307462d44726f6964311330110603550403130a4f73636172204d697261301e170d3230313031333032353534395a170d3438303232393032353534395a30493120301e060355040a13174d6f6c6c7920496e7374616e74204d657373656e6765723110300e060355040b1307462d44726f6964311330110603550403130a4f73636172204d69726130820222300d06092a864886f70d01010105000382020f003082020a0282020100b249333b8017c58c84c6341e510637936bec51e7f36b1127b882020a2a9b8007abba407c12628b9156416f69850ebba9f1ba881d827a8874a018ac1efaac22ce9f07ee8a414df027410d6a8359b6799b764fb0e7a13339348d34f6a697dc7ff79f2e6cbfbda8213d243b265792ec6478aefd310c395494d245b6038a836d13f290ef3f3cba10d507456413294a0ad6eb9b1852605c93c00b14ba9d4c42fa7b72dbe3f492b412d39e45cf3a75a2c8bcb27c0c81cf49a626f1f0972c31967a785accc49a4992bbbaec5060659ed17a533a09071da00b37bd617f901027951d292cdc3bda63e2778ea458b3a243df3ade6e25a662bf1d0e1f8966a2bec405bab4829f954a624206ccbbbaed02556eb2fddf48238e50380be56c1ba1defc42b1ba958de355f12a35c0f4f679ffe3b0a7b027092c47c2d672dd6ab19c2cb23b58dcc3fa7a4a904d39d2ac7eac8e2e239bfd3688c2f59f9cb80f2174c0165582c1003a7ab2006df4f3216a635b30e9a2bbb062b07c81656063006fc126ffb4c8a9c64674f186dd480be8216d16e5ab2d03092166a2f64f1dbae0c564a55c9b77a157e69957454f4d4a62cc9368964679c36f0b187cb00239444210e1ec7d51d45bbfbdf96701d3df20fb51affbf891cb1bd65fd917c15a9999c56322c41c70ab2f0b821bc8977f5bc69de392e7a7977d5f2ff83282576cf7927ba2a1111d9f0c6b0f210203010001a321301f301d0603551d0e04160414d3ee008c3f0af19fa46528e17691c4cc6657b9fd300d06092a864886f70d01010b0500038202010030b9226f391f9df96fbea9fd8111b1bf3dd1b2947a6dc2044fdff7c3b7c261557d4d2e8dc398b5ed0a7bc5b666a2f894c40a4a156e4412720a6219a445aec6074bbd2378a0b82d46d245318b954d0841a4e5909c259871fcd93941fcae7b4a8f884b55bdc3a0af57caa5797fbf1e26ed625cb1e03a6b47e31d0c6afb447804f2de605facf3d0c35f4e410d3a59706a482831cf7ab72057363848919a2f854ae3279fcc246277f3493f3b88cac12bb6500d63981d2fe2126579e931b3882879a8df2404d36b415887b652402c70d5eeba627f96a1ea2e095e60e55d5d3e678516551e501eb2d675b2cc7fe9b9d3e923e411b773fb8f643855ddf1f09bae72f6d0c27925e3c245ef7bb665bb0ee531ad4fb3fec9f0f54d016e4111fecbd613c1ea4bad69a385c6c90706c6bdeaad2f08292594e951ef7a729eda3f7b8a1959b2d49fc032eab02e097b482bb85577e27a6700ac188be4581d5b0e27b4f1b22dc0c44b45e4dd2acd3934b8dd557106fc9bf0a2402ad2e72d43a090a4a4fb2ccd5fc3f0add400f91b9e22a5740cc27a1d494b651456a871dfece9aa35366f2fae1905f41c3b04dca0386889507f57c1e3eff05f30cb87e38d1d1f45c2c05815bde12f11225c22467e6ea5af04c1f3f1a0d60592c701f7ea00e809bc46f92759949a57294d13e6bad30cb31f111ace4433a634e407684282e127a67aa346487ca49b85" timestamp="1623754603" url="https://molly.im/fdroid/foss/fdroid/repo" version="21">
 		<description>The official repository of Molly for use with the F-Droid client. Applications in this repository are the same signed binaries that are released on GitHub. </description>
 	</repo>
 	<application id="im.molly.app">
--- a/foss/repo
+++ b/foss/repo
@ -0,0 +1 @@
+fdroid/repo
--- a/foss/repo/index-v1.jar
+++ b/foss/repo/index-v1.jar
--- a/foss/repo/index.html
+++ b/foss/repo/index.html
@ -1,9 +0,0 @@
-<html lang="en">
-  <head>
-    <meta charset="UTF-8">
-    <title>Molly F-Droid Repo (FOSS)</title>
-  </head>
-  <body>
-    This <a href="https://molly.im/fdroid/foss/repo?fingerprint=5198DAEF37FC23C14D5EE32305B2AF45787BD7DF2034DE33AD302BDB3446DF74">URL</a> is to be used with F-Droid app. Go <a href="../../">here</a> to the repo overview page.
-  </body>
-</html>
--- a/foss/repo/index.jar
+++ b/foss/repo/index.jar
--- a/img/foss/qrcode.png
+++ b/img/foss/qrcode.png
--- a/index.html
+++ b/index.html
@ -83,14 +83,14 @@
 				</div>
 				<div id="collapseTwo" class="collapse" aria-labelledby="headingTwo" data-parent="#accordion">
 					<div class="card-body px-5">
-						<p>1. Open <a href="fdroidrepos://molly.im/fdroid/foss/repo?fingerprint=5198DAEF37FC23C14D5EE32305B2AF45787BD7DF2034DE33AD302BDB3446DF74"
+						<p>1. Open <a href="fdroidrepos://molly.im/fdroid/foss/fdroid/repo?fingerprint=5198DAEF37FC23C14D5EE32305B2AF45787BD7DF2034DE33AD302BDB3446DF74"
 							rel="noreferrer">this link</a>
 								on your mobile device, or scan the <strong>QR code</strong> below. It should open the F-Droid app.
 						</p>
-						<a href="https://molly.im/fdroid/foss/repo?fingerprint=5198DAEF37FC23C14D5EE32305B2AF45787BD7DF2034DE33AD302BDB3446DF74">
+						<a href="https://molly.im/fdroid/foss/fdroid/repo?fingerprint=5198DAEF37FC23C14D5EE32305B2AF45787BD7DF2034DE33AD302BDB3446DF74">
 							<figure class="figure mr-4">
 								<img src="img/foss/qrcode.png" alt="">
-								<figcaption class="figure-caption text-center">https://molly.im/fdroid/foss/repo</figcaption>
+								<figcaption class="figure-caption text-center">https://molly.im/fdroid/foss/fdroid/repo</figcaption>
 							</figure>
 						</a>
 						<p>2. When the <strong>Add new repository</strong> screen appears, click <strong>Add</strong>.</p>