diff --git a/Dockerfile b/Dockerfile index c6f4826..3c0ec7f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ RUN sed -i 's,#DisableSandbox,DisableSandbox,' /etc/pacman.conf # Note: update (-u) so that the newly installed tools use up-to-date packages. # For example, gcc (in base-devel) fails if it uses an old glibc (from # base image). -RUN pacman -Syu --noconfirm base-devel +RUN pacman -Syu --noconfirm base-devel git # Patch makepkg to allow running as root; see # https://www.reddit.com/r/archlinux/comments/6qu4jt/how_to_run_makepkg_in_docker_container_yes_as_root/ @@ -46,8 +46,7 @@ USER builder RUN \ gpg --import /tmp/gpg_key_6BC26A17B9B7018A.gpg.asc && \ cd /tmp/ && \ - curl --output aurutils.tar.gz https://aur.archlinux.org/cgit/aur.git/snapshot/aurutils.tar.gz && \ - tar xf aurutils.tar.gz && \ + git clone --depth 1 https://aur.archlinux.org/aurutils.git && \ cd aurutils && \ makepkg --syncdeps --noconfirm && \ sudo pacman -U --noconfirm aurutils-*.pkg.tar.zst && \ diff --git a/update_repository.sh b/update_repository.sh index 85ffbdd..7707223 100755 --- a/update_repository.sh +++ b/update_repository.sh @@ -27,6 +27,17 @@ sudo --user builder \ --noconfirm --noview \ --database aurci2 --root /local_repository \ $packages_with_aur_dependencies + +cd /local_repository +shopt -s nullglob +for file in *:*pkg.tar*; do + echo "Detected colon in filename: $file" + new_name="${file//:/.}" + echo "Renaming to: $new_name" + mv "$file" "$new_name" + sudo --user builder repo-add aurci2.db.tar.gz "$new_name" +done +shopt -u nullglob # Move the local repository to the workspace. if [ -n "$GITHUB_WORKSPACE" ]