Make repository paths not broken

ish-app · Nov 18, 2023 · ca560d9 · ca560d9
1 parent bae5808
commit ca560d9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/app/gen_apk_repositories.py b/app/gen_apk_repositories.py
@@ -6,13 +6,14 @@ def trim(x, start, end):
     return x[len(start):-len(end)]
 
 APK_REPOSITORIES = [
-    'v3.14/main/x86',
-    'v3.14/community/x86',
+    ('v3.14', 'main'),
+    ('v3.14', 'community'),
 ]
+ARCH = 'x86' # TODO: support more archs
 
 repos_file = []
-for repo in APK_REPOSITORIES:
-    with open(f'{os.environ["SRCROOT"]}/deps/aports/{repo}/index.txt') as f:
+for version, repo in APK_REPOSITORIES:
+    with open(f'{os.environ["SRCROOT"]}/deps/aports/{version}/{repo}/{ARCH}/index.txt') as f:
         index_name = f.read()
     index_name = trim(index_name, 'APKINDEX-', '.tar.gz\n')
     repos_file.append(f'http://apk.ish.app/{index_name}/{repo}')

diff --git a/iSH.xcodeproj/project.pbxproj b/iSH.xcodeproj/project.pbxproj
@@ -1815,6 +1815,7 @@
 			inputPaths = (
 				"$(SRCROOT)/deps/aports/main/x86/index.txt",
 				"$(SRCROOT)/deps/aports/community/x86/index.txt",
+				"$(SRCROOT)/app/gen_apk_repositories.py",
 			);
 			name = "Generate APK Repositories File";
 			outputFileListPaths = (
@@ -1933,6 +1934,7 @@
 			inputPaths = (
 				"$(SRCROOT)/deps/aports/main/x86/index.txt",
 				"$(SRCROOT)/deps/aports/community/x86/index.txt",
+				"$(SRCROOT)/app/gen_apk_repositories.py",
 			);
 			name = "Generate APK Repositories File";
 			outputFileListPaths = (