nerd/rufus
1
1
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2024-08-14 23:57:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

[iso] add 'inst.repo' Red-Hat workaround for CentOS Stream

Browse source 
* Since CentOS Stream does not use the 'CentOS-8.*' labelling scheme.
* This is a follow up to #1777.
* Also fix Windows Kit location for signing scripts.
This commit is contained in:
Pete Batard 2021-11-22 20:11:10 +00:00
parent d840083a32
commit eeca1f279c
No known key found for this signature in database
GPG key ID: 38E0CF5E69EDD671
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
_sign.cmd
View file

@ -1,2 +1,2 @@
@echo off @echo off
"C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64\signtool" sign /v /sha1 9ce9a71ccab3b38a74781b975f1c228222cf7d3b /fd SHA256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp %1 "C:\Program Files (x86)\Windows Kits\10\bin\10.0.22000.0\x64\signtool" sign /v /sha1 9ce9a71ccab3b38a74781b975f1c228222cf7d3b /fd SHA256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /td SHA256 %1

4
res/appstore/packme.cmd
View file

@ -22,7 +22,7 @@ del /q *.appx >NUL 2>&1
del /q *.appxbundle >NUL 2>&1 del /q *.appxbundle >NUL 2>&1
del /q *.map >NUL 2>&1 del /q *.map >NUL 2>&1
set WDK_PATH=C:\Program Files (x86)\Windows Kits\10\bin\10.0.20348.0\x64 set WDK_PATH=C:\Program Files (x86)\Windows Kits\10\bin\10.0.22000.0\x64
set ZIP_PATH=C:\Program Files\7-Zip set ZIP_PATH=C:\Program Files\7-Zip
set SIGNATURE_SHA1=9ce9a71ccab3b38a74781b975f1c228222cf7d3b set SIGNATURE_SHA1=9ce9a71ccab3b38a74781b975f1c228222cf7d3b
set MSBUILD_PATH=C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin set MSBUILD_PATH=C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin
@ -73,7 +73,7 @@ del version.txt
echo Will create %VERSION% AppStore Bundle echo Will create %VERSION% AppStore Bundle
pause pause
"%WDK_PATH%\signtool" sign /v /sha1 %SIGNATURE_SHA1% /fd SHA256 /td SHA256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp *.exe "%WDK_PATH%\signtool" sign /v /sha1 %SIGNATURE_SHA1% /fd SHA256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /td SHA256 *.exe
if ERRORLEVEL 1 goto out if ERRORLEVEL 1 goto out
echo [Files]> bundle.map echo [Files]> bundle.map

2
src/rufus.c
View file

@ -1263,7 +1263,7 @@ DWORD WINAPI ImageScanThread(LPVOID param)
const char* redhat8_derivative[] = { const char* redhat8_derivative[] = {
"^AlmaLinux-8.*", // AlmaLinux 8.x "^AlmaLinux-8.*", // AlmaLinux 8.x
"^Fedora.*-3[3-9].*", // Fedora 33-39 "^Fedora.*-3[3-9].*", // Fedora 33-39
"^CentOS-8.*", // CentOS 8.x "^CentOS.*-8.*", // CentOS and CentOS Stream 8.x
"^OL-8.*", // Oracle Linux 8.x "^OL-8.*", // Oracle Linux 8.x
"^RHEL-8.*", // Red Hat 8.x "^RHEL-8.*", // Red Hat 8.x
"^Rocky-8.*", // Rocky Linux 8.x "^Rocky-8.*", // Rocky Linux 8.x

10
src/rufus.rc
View file

@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDD_DIALOG DIALOGEX 12, 12, 232, 326 IDD_DIALOG DIALOGEX 12, 12, 232, 326
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_ACCEPTFILES EXSTYLE WS_EX_ACCEPTFILES
CAPTION "Rufus 3.18.1853" CAPTION "Rufus 3.18.1854"
FONT 9, "Segoe UI Symbol", 400, 0, 0x0 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
BEGIN BEGIN
LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@ -395,8 +395,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,18,1853,0 FILEVERSION 3,18,1854,0
PRODUCTVERSION 3,18,1853,0 PRODUCTVERSION 3,18,1854,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -414,13 +414,13 @@ BEGIN
VALUE "Comments", "https://rufus.ie" VALUE "Comments", "https://rufus.ie"
VALUE "CompanyName", "Akeo Consulting" VALUE "CompanyName", "Akeo Consulting"
VALUE "FileDescription", "Rufus" VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "3.18.1853" VALUE "FileVersion", "3.18.1854"
VALUE "InternalName", "Rufus" VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2021 Pete Batard (GPL v3)" VALUE "LegalCopyright", "© 2011-2021 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html" VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
VALUE "OriginalFilename", "rufus-3.18.exe" VALUE "OriginalFilename", "rufus-3.18.exe"
VALUE "ProductName", "Rufus" VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "3.18.1853" VALUE "ProductVersion", "3.18.1854"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"