Skip to content

Commit

Permalink
Merge branch 'signtool'
Browse files Browse the repository at this point in the history
Triggered by an uptick in duplicate tickets of
git-for-windows/git#592 which threatened to
drown this maintainer in increasingy unpleasant conversations (and not all
of them due to honestly not knowing where/how to report bugs), this topic
branch addresses the need to sign our .exe installers with a SHA-2
certificate, and while at it, also makes sure that the uninstaller is
signed.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
  • Loading branch information
dscho committed Feb 1, 2016
2 parents 69307a6 + 0577699 commit 5f321a4
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
8 changes: 4 additions & 4 deletions installer/install.iss
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ SourceDir={#SourcePath}\..\..\..\..
#if BITNESS=='64'
ArchitecturesInstallIn64BitMode=x64
#endif
#ifdef SIGNTOOL
SignTool=signtool
#endif

; Installer-related
AllowNoIcons=yes
Expand Down Expand Up @@ -1262,12 +1265,9 @@ end;
procedure CurStepChanged(CurStep:TSetupStep);
var
AppDir,ProgramData,DllPath,FileName,Cmd,Msg:String;
BuiltIns,ImageNames,EnvPath,EnvHome:TArrayOfString;
BuiltIns,ImageNames,EnvPath:TArrayOfString;
Count,i:Longint;
LinkCreated:Boolean;
FindRec:TFindRec;
RootKey:Integer;
Version:TWindowsVersion;
begin
if CurStep=ssInstall then begin
#ifdef DEBUG_WIZARD_PAGE
Expand Down
6 changes: 5 additions & 1 deletion installer/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,12 @@ printf "%s\n%s%s" \
"$inno_defines" \
>config.iss

signtool=
test -z "$(git config alias.signtool)" ||
signtool="//Ssigntool=\"git signtool \\\$f\" //DSIGNTOOL"

echo "Launching Inno Setup compiler ..." &&
./InnoSetup/ISCC.exe install.iss >install.log ||
eval ./InnoSetup/ISCC.exe "$signtool" install.iss >install.log ||
die "Could not make installer"

if test -n "$test_installer"
Expand Down
2 changes: 0 additions & 2 deletions please.sh
Original file line number Diff line number Diff line change
Expand Up @@ -638,8 +638,6 @@ release () { #
http://go.microsoft.com/fwlink/p/?linkid=84091 >&2
else
for file in \
"$HOME"/Git-"$ver"-64-bit.exe \
"$HOME"/Git-"$ver"-32-bit.exe \
"$HOME"/PortableGit-"$ver"-64-bit.7z.exe \
"$HOME"/PortableGit-"$ver"-32-bit.7z.exe
do
Expand Down

0 comments on commit 5f321a4

Please sign in to comment.