Skip to content

Commit c463f1a

Browse files
committed
makepkg-git: use the correct git.exe for makepkg
Now that we are adding support for the i686 flavor of the `makepkg-git` SDK artifact, we need to ensure that its `/usr/bin/git` (which is only a script in that SDK artifact, handing off to the MINGW version of `git.exe`) calls a `git.exe` that actually exists. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 50deb2b commit c463f1a

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

please.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3552,7 +3552,8 @@ create_sdk_artifact () { # [--out=<directory>] [--git-sdk=<directory>] [--bitnes
35523552
fi &&
35533553
if test makepkg-git = $mode && test ! -x "$output_path/usr/bin/git"
35543554
then
3555-
printf '#!/bin/sh\n\nexec /mingw64/bin/git.exe "$@"\n' >"$output_path/usr/bin/git"
3555+
printf '#!/bin/sh\n\nexec %s/bin/git.exe "$@"\n' \
3556+
"/mingw$bitness" >"$output_path/usr/bin/git"
35563557
fi &&
35573558
if test makepkg-git = $mode && ! grep -q http://docbook.sourceforge.net/release/xsl-ns/current "$output_path/etc/xml/catalog"
35583559
then

0 commit comments

Comments
 (0)