diff --git a/aur-sync.sh b/aur-sync.sh index dd2a28eff1474272b1d6c5a91ca2a55c706f0544..775f1366d012f0d305fcff783ea59f7acc71f90c 100755 --- a/aur-sync.sh +++ b/aur-sync.sh @@ -2,9 +2,9 @@ http_upstreams=( # http upstreams has no auto-update - 'https://github.com/fphoenix88888/ttf-mswin10-arch/raw/master/ttf-ms-win10-zh_cn-10.0.18362.116-2-any.pkg.tar.xz' - 'https://github.com/fphoenix88888/ttf-mswin10-arch/raw/master/ttf-ms-win10-zh_tw-10.0.18362.116-2-any.pkg.tar.xz' - 'https://github.com/fphoenix88888/ttf-mswin10-arch/raw/master/ttf-ms-win10-10.0.18362.116-2-any.pkg.tar.xz' + 'https://raw.githubusercontent.com/fphoenix88888/ttf-mswin10-arch/master/ttf-ms-win10-zh_tw-10.0.19043.1055-1-any.pkg.tar.zst' + 'https://raw.githubusercontent.com/fphoenix88888/ttf-mswin10-arch/master/ttf-ms-win10-zh_cn-10.0.19043.1055-1-any.pkg.tar.zst' + 'https://raw.githubusercontent.com/fphoenix88888/ttf-mswin10-arch/master/ttf-ms-win10-10.0.19043.1055-1-any.pkg.tar.zst' ) repo_upstreams=( # Take care of the tailing "/"!!! @@ -35,6 +35,7 @@ aur_upstreams=( gnome-terminal-transparency shared-bootdir-helper chrome-gnome-shell + oreo-cursors-git ) build_outdir="mirrors/recolic-aur" @@ -46,7 +47,7 @@ function sync_aur () { # Use the external loop to force pikaur to skip failed packages. for ele in "${aur_upstreams[@]}"; do # pikaur would skip if the package is already up-to-date. - sudo docker run -i --cpus 1.2 --rm -v "$(pwd)/mirrors/recolic-aur":/home/builder/.cache/pikaur/pkg recolic/pikaur bash -c "chown builder -R /home/builder/.cache/pikaur/pkg && sudo -u builder pikaur -Syw --noconfirm $ele" + sudo docker run -i --cpus 1.2 --rm -v "$(pwd)/$build_outdir":/home/builder/.cache/pikaur/pkg recolic/pikaur bash -c "chown builder -R /home/builder/.cache/pikaur/pkg && sudo -u builder pikaur -Syw --noconfirm $ele" [[ $? != 0 ]] && echo "WARNING: Failed to build $ele" done } diff --git a/docker-pikaur/install-pikaur.sh b/docker-pikaur/install-pikaur.sh index 6f5b9e1f4ef736a55d893458397cfaa5f49a54a9..53be06fdd91bb5e8a276cf331ea4593d10c7be34 100755 --- a/docker-pikaur/install-pikaur.sh +++ b/docker-pikaur/install-pikaur.sh @@ -1,5 +1,5 @@ #!/bin/bash -pacman -Sy --noconfirm git pyalpm python-commonmark && +pacman -Sy --noconfirm git pyalpm python-commonmark python-pip python-build python-installer python-setuptools python-markdown-it-py && git clone https://aur.archlinux.org/pikaur.git && chmod 777 -R pikaur && cd pikaur &&