From c6639f10a56a3da33b839ca3537b00de0247602d Mon Sep 17 00:00:00 2001 From: Steffen Prohaska Date: Sun, 27 Jul 2008 10:18:48 +0200 Subject: [PATCH] WinGit: Modify installer to handle 'libexec/git-core' directory layout We add files in libexec/git-core to the list of files to be installed. We also adjust the path to git-gui in the shortcut and the shell extension. Signed-off-by: Steffen Prohaska --- share/WinGit/copy-files.sh | 6 +++--- share/WinGit/install.iss | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/share/WinGit/copy-files.sh b/share/WinGit/copy-files.sh index fba230d836..171a45a946 100644 --- a/share/WinGit/copy-files.sh +++ b/share/WinGit/copy-files.sh @@ -28,7 +28,7 @@ echo "Copying files" && mkdir -p doc/git/html && cd doc/git/html && git --git-dir=/doc/git/html/.git archive HEAD | tar xf -) && (cd / && tar cf - \ -$(ls bin/git* | grep -v 'cvs\|send-email\|shell\|archimport\|instaweb\|filter-branch') \ +$(ls {bin,libexec/git-core}/git* | grep -v 'cvs\|send-email\|shell\|archimport\|instaweb\|filter-branch') \ bin/{awk,basename.exe,bash.exe,bunzip2,bzip2.exe,c_rehash,\ cat.exe,chmod.exe,clear,cmp.exe,cp.exe,cut.exe,cvs.exe,date.exe,diff.exe,\ du.exe,echo,egrep,env.exe,expr.exe,false.exe,find.exe,gawk.exe,grep.exe,\ @@ -49,12 +49,12 @@ tar xf - && rm -rf lib/perl5/5.8.8/Encode/ lib/perl5/5.8.8/msys/auto/Encode/ bin/cvs.exe && gitmd5=$(md5sum bin/git.exe | cut -c 1-32) && mkdir etc && -md5sum bin/git-*.exe | sed -n "s/^$gitmd5 \\*//p" > etc/fileList-builtins.txt && +md5sum {bin,libexec/git-core}/git-*.exe | sed -n "s/^$gitmd5 \\*//p" > etc/fileList-builtins.txt && rm $(cat etc/fileList-builtins.txt) && (cd /mingw && tar cf - bin/*{tcl,tk,wish,gpg,curl.exe,libcurl,libiconv}* \ lib/*{tcl,tk}* libexec/gnupg/) | tar xf - && -strip bin/{[a-fh-z],g[a-oq-z]}*.exe && +strip bin/{[a-fh-z],g[a-oq-z]}*.exe libexec/git-core/*.exe && cp /git/contrib/completion/git-completion.bash etc/ && cp /etc/termcap etc/ && cp /etc/gitconfig etc/ && diff --git a/share/WinGit/install.iss b/share/WinGit/install.iss index 0f0514d772..5ce05f0d02 100644 --- a/share/WinGit/install.iss +++ b/share/WinGit/install.iss @@ -39,7 +39,7 @@ Source: "*"; DestDir: "{app}"; Excludes: "\*.bmp, gpl-2.0.rtf, \install.*, \tmp. Source: ReleaseNotes.rtf; DestDir: "{app}"; Flags: isreadme [Icons] -Name: "{group}\Git GUI"; Filename: "{app}\bin\wish.exe"; Parameters: """{app}\bin\git-gui"""; WorkingDir: "%USERPROFILE%"; IconFilename: "{app}\etc\git.ico" +Name: "{group}\Git GUI"; Filename: "{app}\bin\wish.exe"; Parameters: """{app}\libexec\git-core\git-gui"""; WorkingDir: "%USERPROFILE%"; IconFilename: "{app}\etc\git.ico" Name: "{group}\Git Bash"; Filename: "{syswow64}\cmd.exe"; Parameters: "/c """"{app}\bin\sh.exe"" --login -i"""; WorkingDir: "%USERPROFILE%"; IconFilename: "{app}\etc\git.ico" Name: "{group}\Uninstall Git"; Filename: "{uninstallexe}" Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\Git Bash"; Filename: "{syswow64}\cmd.exe"; Parameters: "/c """"{app}\bin\sh.exe"" --login -i"""; WorkingDir: "%USERPROFILE%"; IconFilename: "{app}\etc\git.ico"; Tasks: quicklaunchicon @@ -609,7 +609,7 @@ begin if IsTaskSelected('guiextension') then begin if (not RegWriteStringValue(RootKey,'SOFTWARE\Classes\Directory\shell\git_gui','','Git &GUI Here')) - or (not RegWriteStringValue(RootKey,'SOFTWARE\Classes\Directory\shell\git_gui\command','','"'+AppDir+'\bin\wish.exe" "'+AppDir+'\bin\git-gui" "--working-dir" "%1"')) then begin + or (not RegWriteStringValue(RootKey,'SOFTWARE\Classes\Directory\shell\git_gui\command','','"'+AppDir+'\bin\wish.exe" "'+AppDir+'\libexec\git-core\git-gui" "--working-dir" "%1"')) then begin Msg:='Line {#emit __LINE__}: Unable to create "Git GUI Here" shell extension.'; MsgBox(Msg,mbError,MB_OK); Log(Msg); -- 2.11.4.GIT