diff --git a/update.sh b/update.sh index fc4eb70..05543d3 100755 --- a/update.sh +++ b/update.sh @@ -39,7 +39,7 @@ git checkout ${BRANCH} || exit 1 cd "${BASEDIR}" ./updateMojang.py || fail_in -# ./updateForge.py || fail_in +./updateForge.py || fail_in ./updateFabric.py || fail_in ./updateLiteloader.py || fail_in @@ -62,7 +62,7 @@ git checkout ${BRANCH} || exit 1 cd "${BASEDIR}" ./generateMojang.py || fail_out -# ./generateForge.py || fail_out +./generateForge.py || fail_out ./generateFabric.py || fail_in ./generateLiteloader.py || fail_out ./index.py || fail_out diff --git a/updateForge.py b/updateForge.py index 80acbee..53def8f 100755 --- a/updateForge.py +++ b/updateForge.py @@ -36,17 +36,17 @@ forever_cache = FileCache('http_cache', forever=True) sess = CacheControl(requests.Session(), forever_cache) # get the remote version list fragments -r = sess.get('https://files.minecraftforge.net/maven/net/minecraftforge/forge/maven-metadata.json') +r = sess.get('https://files.minecraftforge.net/net/minecraftforge/forge/maven-metadata.json') r.raise_for_status() main_json = r.json() assert type(main_json) == dict -r = sess.get('https://files.minecraftforge.net/maven/net/minecraftforge/forge/promotions_slim.json') +r = sess.get('https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json') r.raise_for_status() promotions_json = r.json() assert type(promotions_json) == dict -promotedKeyExpression = re.compile("((?P[0-9\\.]+)-)?(?P(latest)|(recommended))(-(?P[a-zA-Z0-9\\.]+))?") +promotedKeyExpression = re.compile("(?P[^-]+)-(?P(latest)|(recommended))(-(?P[a-zA-Z0-9\\.]+))?") recommendedSet = set() @@ -88,7 +88,7 @@ def getSingleForgeFilesManifest(longversion): files_json=json.load(f) from_file = True else: - fileUrl = 'https://files.minecraftforge.net/maven/net/minecraftforge/forge/%s/meta.json' % longversion + fileUrl = 'https://files.minecraftforge.net/net/minecraftforge/forge/%s/meta.json' % longversion r = sess.get(fileUrl) r.raise_for_status() files_json = r.json()