St PKGBUILD changes and pacman.sh file changes