2
0
Эх сурвалжийг харах

Improve on fc09be12, don't actually need the .txt for easy linking.

Martijn Laan 2 сар өмнө
parent
commit
345730dbc0

+ 1 - 1
README.md

@@ -298,7 +298,7 @@ and will automatically run the aforementioned build workflow on changes, if it's
 [Projects\Src\Compression.SevenZipDecoder\7zDecode]: <Projects/Src/Compression.SevenZipDecoder/7zDecode>
 [7-Zip]: https://www.7-zip.org/
 [secret]: https://docs.github.com/en/actions/security-guides/encrypted-secrets
-[this public key file]: https://files.jrsoftware.org/is/misc/def01.ispublickey.txt
+[this public key file]: https://files.jrsoftware.org/is/misc/def01.ispublickey
 [is7z]: https://github.com/jrsoftware/is7z
 [iscompress]: https://github.com/jrsoftware/iscompress
 [isscint]: https://github.com/jrsoftware/isscint

+ 1 - 1
build-ce.bat

@@ -40,7 +40,7 @@ if not exist files\issigtool.exe (
 
 rem  Verify precompiled binaries which are used during compilation
 rem  Note: Other precompiled binaries are verified by Setup.iss
-call .\issig.bat verify --key-file=def01.ispublickey.txt ^
+call .\issig.bat verify --key-file=def01.ispublickey ^
   Projects\Src\Setup.HelperEXEs.res ^
   Projects\Src\Compression.LZMADecompressor\Lzma2Decode\ISLzmaDec.obj ^
   Projects\Src\Compression.LZMA1SmallDecompressor\LzmaDecode\LzmaDecodeInno.obj ^

+ 1 - 1
build.bat

@@ -57,7 +57,7 @@ if not exist files\issigtool.exe (
 
 rem  Verify precompiled binaries which are used during compilation
 rem  Note: Other precompiled binaries are verified by Setup.iss
-call .\issig.bat verify --key-file=def01.ispublickey.txt ^
+call .\issig.bat verify --key-file=def01.ispublickey ^
   Projects\Src\Setup.HelperEXEs.res ^
   Projects\Src\Compression.LZMADecompressor\Lzma2Decode\ISLzmaDec.obj ^
   Projects\Src\Compression.LZMA1SmallDecompressor\LzmaDecode\LzmaDecodeInno.obj ^

+ 0 - 0
def01.ispublickey.txt → def01.ispublickey


+ 0 - 0
def02.ispublickey.txt → def02.ispublickey


+ 1 - 1
issig.bat

@@ -48,7 +48,7 @@ if "%1"=="verify" goto signorverify
 if not "%1"=="" goto failed
 
 :embed
-set publickeyfile=def02.ispublickey.txt
+set publickeyfile=def02.ispublickey
 Files\ISSigTool.exe export-public-key "%publickeyfile%"
 if errorlevel 1 goto failed
 if not exist "%publickeyfile%" goto failed

+ 2 - 2
setup.allowedpublickeys.iss

@@ -3,5 +3,5 @@
 // build-ce.bat. To ignore this change consider using Git's assume-unchanged or skip-worktree functionality.
 //
 [ISSigKeys]
-Name: mykey1; KeyID: def0147c3bbc17ab99bf7b7a9c2de1390283f38972152418d7c2a4a7d7131a38; KeyFile: {#__DIR__}\def01.ispublickey.txt
-Name: mykey2; KeyFile: {#__DIR__}\def02.ispublickey.txt
+Name: mykey1; KeyID: def0147c3bbc17ab99bf7b7a9c2de1390283f38972152418d7c2a4a7d7131a38; KeyFile: {#__DIR__}\def01.ispublickey
+Name: mykey2; KeyFile: {#__DIR__}\def02.ispublickey