From 0775ccadbc35e11e2fb0fb635c7fbc30bf016a26 Mon Sep 17 00:00:00 2001 From: Zenithal Date: Thu, 18 Nov 2021 18:55:09 +0800 Subject: [PATCH] stackage: fix url substitution Fixes https://github.com/tuna/issues/issues/1379 --- github-raw.py | 1 + stackage.py | 17 ++++++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/github-raw.py b/github-raw.py index 777e0d1..dbc3331 100755 --- a/github-raw.py +++ b/github-raw.py @@ -16,6 +16,7 @@ BASE_URL = os.getenv("TUNASYNC_UPSTREAM_URL", "https://api.github.com/repos/") WORKING_DIR = os.getenv("TUNASYNC_WORKING_DIR") REPOS = [ # owner/repo, tree, tree, tree, blob + ## for stackage ["fpco/minghc", "master", "bin", "7z.exe"], ["fpco/minghc", "master", "bin", "7z.dll"], ] diff --git a/stackage.py b/stackage.py index b97c789..8150867 100755 --- a/stackage.py +++ b/stackage.py @@ -53,12 +53,23 @@ class StackageSession(object): ) if 'msys2' in d: - for os in d['msys2']: - print(os) - d['msys2'][os]['url'] = d['msys2'][os]['url'].replace( + if 'windows32' in d['msys2']: + print('windows32') + d['msys2']['windows32']['url'] = d['msys2']['windows32']['url'].replace( 'https://github.com/fpco/stackage-content/releases/download/', + 'https://mirrors.tuna.tsinghua.edu.cn/github-release/commercialhaskell/stackage-content/msys2-') + if 'windows64' in d['msys2']: + print('windows64') + d['msys2']['windows64']['url'] = d['msys2']['windows64']['url'].replace( + 'https://github.com/commercialhaskell/stackage-content/releases/download/', 'https://mirrors.tuna.tsinghua.edu.cn/github-release/commercialhaskell/stackage-content/') + if 'sevenzexe-info' in d: + d['sevenzexe-info']['url'] = 'https://mirrors.tuna.tsinghua.edu.cn/github-raw/fpco/minghc/master/bin/7z.exe' + + if 'sevenzdll-info' in d: + d['sevenzdll-info']['url'] = 'https://mirrors.tuna.tsinghua.edu.cn/github-raw/fpco/minghc/master/bin/7z.dll' + for i in ['portable-git', 'stack', 'ghcjs']: del d[i] with open(self._base_path / 'stack-setup.yaml', 'w') as f: