Skip to content

make-file-list: adjust for lower-case Perl package names #748

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dscho merged 1 commit into from
Sep 26, 2026
Merged

make-file-list: adjust for lower-case Perl package names #748

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions make-file-list.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,14 +177,19 @@ has_pacman_package mingw-w64-$PACMAN_ARCH-curl-winssl &&
LIBCURL_EXTRA=mingw-w64-$PACMAN_ARCH-curl-openssl-alternate ||
LIBCURL_EXTRA=

# The Perl package names were downcased in https://github.com/msys2/MSYS2-packages/pull/6648
ls -d /var/lib/pacman/local/perl-* | grep -q perl-JSON &&
PERL_JSON_PKGNAME=perl-JSON ||
PERL_JSON_PKGNAME=perl-json

# Packages that have been added after Git SDK 1.0.0 was released...
required=
for req in mingw-w64-$PACMAN_ARCH-git-credential-manager $SH_FOR_REBASE $LIBCURL_EXTRA \
$(test -n "$MINIMAL_GIT" || echo \
mingw-w64-$PACMAN_ARCH-connect unzip docx2txt \
mingw-w64-$PACMAN_ARCH-antiword mingw-w64-$PACMAN_ARCH-odt2txt \
mingw-w64-$PACMAN_ARCH-xpdf-tools ssh-pageant mingw-w64-$PACMAN_ARCH-git-lfs \
tig nano perl-JSON libpcre2_8 libpcre2posix $GIT_UPDATE_EXTRA_PACKAGES)
tig nano $PERL_JSON_PKGNAME libpcre2_8 libpcre2posix $GIT_UPDATE_EXTRA_PACKAGES)
do
has_pacman_package $req ||
has_pacman_package $req-git ||
Expand All @@ -207,7 +212,7 @@ mingw-w64-$PACMAN_ARCH-git-extra openssh msys2-runtime $UTIL_PACKAGES $LIBCURL_E
if test -z "$MINIMAL_GIT"
then
packages="$packages mingw-w64-$PACMAN_ARCH-git-doc-html ncurses mintty vim nano
winpty less gnupg tar diffutils patch dos2unix which subversion perl-JSON
winpty less gnupg tar diffutils patch dos2unix which subversion $PERL_JSON_PKGNAME
mingw-w64-$PACMAN_ARCH-tk mingw-w64-$PACMAN_ARCH-connect docx2txt
mingw-w64-$PACMAN_ARCH-antiword mingw-w64-$PACMAN_ARCH-odt2txt ssh-pageant
mingw-w64-$PACMAN_ARCH-git-lfs mingw-w64-$PACMAN_ARCH-xz tig $GIT_UPDATE_EXTRA_PACKAGES"
Expand Down
Loading