From 699f8910b8b755a51974b093980071d9a3fea564 Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka Date: Sun, 12 Sep 2021 21:36:16 +0900 Subject: [PATCH] Installer: sign installer if the SIGNBAT_PATH environment variable is defined --- Installer/InnoSetup/WinMerge.iss | 6 ++++-- Installer/InnoSetup/WinMergeARM64.is6.iss | 6 ++++-- Installer/InnoSetup/WinMergeX64.is6.iss | 6 ++++-- Installer/InnoSetup/WinMergeX64.iss | 6 ++++-- Installer/InnoSetup/WinMergeX64NonAdmin.iss | 6 ++++-- 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/Installer/InnoSetup/WinMerge.iss b/Installer/InnoSetup/WinMerge.iss index 3f8080806..b803c4d84 100755 --- a/Installer/InnoSetup/WinMerge.iss +++ b/Installer/InnoSetup/WinMerge.iss @@ -110,8 +110,10 @@ ChangesEnvironment=true OutputDir=..\..\Build AlwaysShowComponentsList=true -;SignTool=signbat $f -;SignedUninstaller=yes +#if GetEnv("SIGNBAT_PATH") != "" +SignTool=signbat $f +SignedUninstaller=yes +#endif [Languages] ;Inno Setup's Native Language diff --git a/Installer/InnoSetup/WinMergeARM64.is6.iss b/Installer/InnoSetup/WinMergeARM64.is6.iss index 9077e9ad5..269d3f4d3 100644 --- a/Installer/InnoSetup/WinMergeARM64.is6.iss +++ b/Installer/InnoSetup/WinMergeARM64.is6.iss @@ -116,8 +116,10 @@ AlwaysShowComponentsList=true ArchitecturesInstallIn64BitMode=arm64 ArchitecturesAllowed=arm64 -;SignTool=signbat $f -;SignedUninstaller=yes +#if GetEnv("SIGNBAT_PATH") != "" +SignTool=signbat $f +SignedUninstaller=yes +#endif [Languages] ;Inno Setup's Native Language diff --git a/Installer/InnoSetup/WinMergeX64.is6.iss b/Installer/InnoSetup/WinMergeX64.is6.iss index 6a87ab5a5..a2319697d 100644 --- a/Installer/InnoSetup/WinMergeX64.is6.iss +++ b/Installer/InnoSetup/WinMergeX64.is6.iss @@ -115,8 +115,10 @@ AlwaysShowComponentsList=true ArchitecturesInstallIn64BitMode=x64 -;SignTool=signbat $f -;SignedUninstaller=yes +#if GetEnv("SIGNBAT_PATH") != "" +SignTool=signbat $f +SignedUninstaller=yes +#endif [Languages] ;Inno Setup's Native Language diff --git a/Installer/InnoSetup/WinMergeX64.iss b/Installer/InnoSetup/WinMergeX64.iss index e365989a3..36f62129f 100644 --- a/Installer/InnoSetup/WinMergeX64.iss +++ b/Installer/InnoSetup/WinMergeX64.iss @@ -112,8 +112,10 @@ AlwaysShowComponentsList=true ArchitecturesInstallIn64BitMode=x64 -;SignTool=signbat $f -;SignedUninstaller=yes +#if GetEnv("SIGNBAT_PATH") != "" +SignTool=signbat $f +SignedUninstaller=yes +#endif [Languages] ;Inno Setup's Native Language diff --git a/Installer/InnoSetup/WinMergeX64NonAdmin.iss b/Installer/InnoSetup/WinMergeX64NonAdmin.iss index 3b1e8e8ce..26a185e13 100644 --- a/Installer/InnoSetup/WinMergeX64NonAdmin.iss +++ b/Installer/InnoSetup/WinMergeX64NonAdmin.iss @@ -111,8 +111,10 @@ AlwaysShowComponentsList=true ArchitecturesInstallIn64BitMode=x64 -;SignTool=signbat $f -;SignedUninstaller=yes +#if GetEnv("SIGNBAT_PATH") != "" +SignTool=signbat $f +SignedUninstaller=yes +#endif [Languages] ;Inno Setup's Native Language -- 2.11.0