Skip to content

Commit 2141a50

Browse files
committed
make-file-list: do not expect /etc/bash.bash_logout to exist
As of `filesystem` 2025.02.23-1, that file does not exist anymore. So let's not insist on its presence when building Git for Windows' artifacts. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 4ab9988 commit 2141a50

File tree

2 files changed

+16
-9
lines changed

2 files changed

+16
-9
lines changed

make-file-list.sh

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -395,15 +395,19 @@ EOF
395395
test -z "$MINIMAL_GIT_WITH_BUSYBOX" ||
396396
echo $MSYSTEM_LOWER/bin/busybox.exe
397397

398-
test -n "$MINIMAL_GIT_WITH_BUSYBOX" || cat <<EOF
399-
etc/profile
400-
etc/profile.d/lang.sh
401-
etc/bash.bash_logout
402-
etc/bash.bashrc
403-
etc/msystem
404-
usr/bin/dash.exe
405-
usr/bin/getopt.exe
406-
EOF
398+
if test -z "$MINIMAL_GIT_WITH_BUSYBOX"
399+
then
400+
cat <<-EOF
401+
etc/profile
402+
etc/profile.d/lang.sh
403+
etc/bash.bashrc
404+
etc/msystem
405+
usr/bin/dash.exe
406+
usr/bin/getopt.exe
407+
EOF
408+
test ! -f /etc/bash.bash_logout ||
409+
echo etc/bash.bash_logout
410+
fi
407411

408412
EXTRA_DLL_FILES=
409413
case $MSYSTEM_LOWER in

please.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3260,6 +3260,9 @@ create_sdk_artifact () { # [--out=<directory>] [--git-sdk=<directory>] [--archit
32603260
/usr/bin/msys-unistring*.dll
32613261
/usr/bin/msys-gnutls*.dll
32623262
3263+
# For the /etc/bash.bash_logout check
3264+
/etc/bash.bash_logout
3265+
32633266
# markdown, to render the release notes
32643267
/usr/bin/markdown
32653268

0 commit comments

Comments
 (0)