Skip to content

Commit 2e0d868

Browse files
committed
installer/portable: also install a redirector for /bin/sh.exe
It was pointed out in git-for-windows/git#208 that SourceTree expects `/bin/sh.exe` to be available. Let's just install the redirector to make SourceTree happy, too. This is a companion patch to fd137f7 (installer/portable: copy redirectors into /bin/{bash,git}.exe, 2015-06-19). Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 053dbd0 commit 2e0d868

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

installer/release.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,12 @@ LIST="$(ARCH=$ARCH BITNESS=$BITNESS PACKAGE_VERSIONS_FILE=package-versions.txt \
8080
sh "$SCRIPTDIR"/../make-file-list.sh)" ||
8181
die "Could not generate file list"
8282

83-
printf "; List of files\n%s\n%s\n%s\n%s\n" \
83+
printf "; List of files\n%s\n%s\n%s\n%s\n%s\n" \
8484
"Source: \"$SCRIPTDIR\\package-versions.txt\"; DestDir: {app}\\etc; Flags: replacesameversion; AfterInstall: DeleteFromVirtualStore" \
8585
"Source: \"$SCRIPTDIR\\usr\\share\\git\\ReleaseNotes.css\"; DestDir: {app}\\usr\\share\\git; Flags: replacesameversion; AfterInstall: DeleteFromVirtualStore" \
8686
"Source: \"cmd\\git.exe\"; DestDir: {app}\\bin; Flags: replacesameversion; AfterInstall: DeleteFromVirtualStore" \
8787
"Source: \"mingw$BITNESS\\share\\git\\compat-bash.exe\"; DestName: bash.exe; DestDir: {app}\\bin; Flags: replacesameversion; AfterInstall: DeleteFromVirtualStore" \
88+
"Source: \"mingw$BITNESS\\share\\git\\compat-bash.exe\"; DestName: sh.exe; DestDir: {app}\\bin; Flags: replacesameversion; AfterInstall: DeleteFromVirtualStore" \
8889
>file-list.iss ||
8990
die "Could not write to file-list.iss"
9091

portable/release.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ mkdir -p "$SCRIPT_PATH/root/bin" ||
5050
die "Could not make bin/ directory"
5151

5252
cp /cmd/git.exe "$SCRIPT_PATH/root/bin/git.exe" &&
53-
cp /mingw$BITNESS/share/git/compat-bash.exe "$SCRIPT_PATH/root/bin/bash.exe" ||
53+
cp /mingw$BITNESS/share/git/compat-bash.exe "$SCRIPT_PATH/root/bin/bash.exe" &&
54+
cp /mingw$BITNESS/share/git/compat-bash.exe "$SCRIPT_PATH/root/bin/sh.exe" ||
5455
die "Could not install bin/ redirectors"
5556

5657
# Make a list of files to include

0 commit comments

Comments
 (0)