Skip to content

Commit

Permalink
installer/portable: copy redirectors into /bin/{bash,git}.exe
Browse files Browse the repository at this point in the history
For backwards-compatibility, we now copy appropriately adjusted versions
of the Git wrapper into /bin/ so that e.g. TortoiseGit/SourceTree find
the same executables as before.

This addresses git-for-windows/git#208

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
  • Loading branch information
dscho committed Jun 19, 2015
1 parent 5b51cb4 commit fd137f7
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 1 deletion.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@
/markdown/*.zip
/markdown/pkg/
/markdown/src/
/portable/root/bin/
/portable/root/cmd/
/portable/root/etc/
4 changes: 3 additions & 1 deletion installer/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,11 @@ LIST="$(ARCH=$ARCH BITNESS=$BITNESS PACKAGE_VERSIONS_FILE=package-versions.txt \
sh "$SCRIPTDIR"/../make-file-list.sh)" ||
die "Could not generate file list"

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

Expand Down
7 changes: 7 additions & 0 deletions portable/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,13 @@ die "Could not make etc/ directory"
mkdir -p "$SCRIPT_PATH/root/tmp" ||
die "Could not make tmp/ directory"

mkdir -p "$SCRIPT_PATH/root/bin" ||
die "Could not make bin/ directory"

cp /cmd/git.exe "$SCRIPT_PATH/root/bin/git.exe" &&
cp /mingw$BITNESS/share/git/compat-bash.exe "$SCRIPT_PATH/root/bin/bash.exe" ||
die "Could not install bin/ redirectors"

# Make a list of files to include
LIST="$(ARCH=$ARCH BITNESS=$BITNESS \
PACKAGE_VERSIONS_FILE="$SCRIPT_PATH"/root/etc/package-versions.txt \
Expand Down

0 comments on commit fd137f7

Please sign in to comment.