bugfix in PR conflict resolver, added missing apps from index json

keighrim · keighrim · commit c45dc4d5663c · 2024-01-25T17:22:24.000-05:00
diff --git a/docs/_data/app-index.json b/docs/_data/app-index.json
@@ -65,6 +65,10 @@
   ],
   "http://apps.clams.ai/swt-detection": [
     "v1.0",
-    "v2.0"
+    "v2.0",
+    "v2.1"
+  ],
+  "http://apps.clams.ai/easyocr-wrapper": [
+    "v1.0"
   ]
 }
diff --git a/docs/_data/apps.json b/docs/_data/apps.json
diff --git a/scripts/resolve_pr_conflict.sh b/scripts/resolve_pr_conflict.sh
@@ -13,7 +13,7 @@ git checkout origin/main -- docs/_data
 # make an intermediate commit with semi-"merge" with main
 git commit --no-edit
 # regenerate submission files
-python scripts/index_page_data.py docs/$app_name/$app_ver
+python3 scripts/index_page_data.py docs/_apps/$app_name_ver
 git add docs/_data
 git commit -m 'regenerated aggregated metadata json files after conflict resolution'
 

Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,10 @@`
`65`	`65`	`],`
`66`	`66`	`"http://apps.clams.ai/swt-detection": [`
`67`	`67`	`"v1.0",`
`68`		`- "v2.0"`
	`68`	`+ "v2.0",`
	`69`	`+ "v2.1"`
	`70`	`+ ],`
	`71`	`+ "http://apps.clams.ai/easyocr-wrapper": [`
	`72`	`+ "v1.0"`
`69`	`73`	`]`
`70`	`74`	`}`