Account for upstream separating the completion and prompt scripts

sschuberth · patthoyts · commit 705df7b2cb26 · 2012-10-04T23:33:46.000+01:00
To make the split transparent to our users, source both files by default.

[PT] Rolled in the sed part of Stefan Naewe's patch.

Signed-off-by: Sebastian Schuberth &lt;sschuberth@gmail.com&gt;
Signed-off-by: Stefan Naewe &lt;stefan.naewe@gmail.com&gt;
Signed-off-by: Pat Thoyts &lt;patthoyts@users.sourceforge.net&gt;
diff --git a/share/WinGit/copy-files.sh b/share/WinGit/copy-files.sh
@@ -86,6 +86,7 @@ tar xf - &&
 cp $MSYSGITROOT/mingw/bin/hd2u.exe bin/dos2unix.exe &&
 strip bin/{[a-fh-z],g[a-oq-z]}*.exe libexec/git-core/*.exe &&
 cp $MSYSGITROOT/git/contrib/completion/git-completion.bash etc/ &&
+cp $MSYSGITROOT/git/contrib/completion/git-prompt.sh etc/ &&
 cp $MSYSGITROOT/etc/termcap etc/ &&
 cp $MSYSGITROOT/etc/inputrc etc/ &&
 sed 's/ = \/mingw\// = \//' < $MSYSGITROOT/etc/gitconfig > etc/gitconfig &&
@@ -95,7 +96,7 @@ mkdir git-cheetah &&
 cp $MSYSGITROOT/src/git-cheetah/explorer/git_shell_ext.dll git-cheetah/ &&
 cp $MSYSGITROOT/src/git-cheetah/explorer/git_shell_ext64.dll git-cheetah/ &&
 cp $MSYSGITROOT/share/WinGit/ReleaseNotes.rtf . &&
-sed 's/^\. .*\(git-completion.bash\)/. \/etc\/\1/' \
+sed 's@/git/contrib/completion@/etc@g' \
 	< $MSYSGITROOT/etc/profile > etc/profile &&
 cp $MSYSGITROOT/share/resources/git.ico etc/ &&
 cp $MSYSGITROOT/share/resources/git.ico share/git-gui/lib/git-gui.ico &&
