build

mackerelio · Sep 25, 2015 · 90a1889 · 90a1889
1 parent aec6007
commit 90a1889
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -10,6 +10,7 @@ environment:
 install:
   - md c:\mackerel-secure
   - ps: if ($env:CERT) { Set-Content c:\mackerel-secure\cert.p12.base64 $env:CERT }
+  - ps: if ($env:CERTPASS) { Set-Content c:\mackerel-secure\certpass $env:CERTPASS }
   - set PATH=c:\go\bin;c:\tools\ruby215\bin;%PATH%;C:\MinGW\bin
   - echo %Path%
   - choco install ruby

diff --git a/wix/build.bat b/wix/build.bat
@@ -28,6 +28,8 @@ REM if defined APPVEYOR_REPO_TAG_NAME (
   certutil -f -decode c:\mackerel-secure\cert.p12.base64 c:\mackerel-secure\cert.p12
 
   REM ref. https://support.comodo.com/index.php?/Default/Knowledgebase/Article/View/68/7/time-stamping-server
-  echo "%CERTPASS%"
-  "%SIGNTOOL%" sign /t http://timestamp.comodoca.com/rfc3161 /f "c:\mackerel-secure\cert.p12" /p "%CERTPASS%" "..\build\mackerel-agent.msi"
+  type "%%CERTPASS%%"
+  type "%CERTPASS%"
+  FOR /F "usebackq" %%w IN (`type c:\mackerel-secure\certpass`) DO echo "%%w"
+  FOR /F "usebackq" %%w IN (`type c:\mackerel-secure\certpass`) DO "%SIGNTOOL%" sign /t http://timestamp.comodoca.com/rfc3161 /f "c:\mackerel-secure\cert.p12" /p "%%w" "..\build\mackerel-agent.msi"
 REM )