Skip to content

Commit 0ad6706

Browse files
Merge pull request #2482 from tunisiano187/patch-1
(es) New regex
2 parents ff2610b + 9d41206 commit 0ad6706

File tree

3 files changed

+15
-7
lines changed

3 files changed

+15
-7
lines changed

automatic/es/legal/VERIFICATION.txt

+3-2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ Package can be verified like this:
88
1. Go to
99

1010
x32: https://www.voidtools.com/ES-1.1.0.26.zip
11+
x64:
1112

1213
to download the archive.
1314

@@ -16,11 +17,11 @@ Package can be verified like this:
1617
- Use Chocolatey utility 'checksum.exe'
1718

1819
checksum32: 978BB07DD5EA1868C716EE17B2F36BD4CBB1E2A4C2E1C439163558506492D873
20+
checksum64:
1921

2022
Using Chocolatey AU:
2123

2224
Get-RemoteChecksum https://www.voidtools.com/ES-1.1.0.26.zip
2325

2426
File 'License.txt' is obtained from:
25-
https://www.voidtools.com/License.txt
26-
27+
https://www.voidtools.com/License.txt

automatic/es/tools/chocolateyInstall.ps1

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ $toolsDir = Split-Path $MyInvocation.MyCommand.Definition
44
$packageArgs = @{
55
packageName = 'es'
66
FileFullPath = "$toolsDir\ES-1.1.0.26.zip"
7+
FileFullPath64 = "$toolsDir\ES-1.1.0.26.zip"
78
Destination = $toolsDir
89
}
910

automatic/es/update.ps1

+11-5
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,14 @@ function global:au_SearchReplace {
77
".\tools\chocolateyInstall.ps1" = @{
88
"(?i)(^\s*packageName\s*=\s*)('.*')" = "`$1'$($Latest.PackageName)'"
99
"(?i)(^\s*FileFullPath\s*=\s*`"[$]toolsDir\\).*" = "`${1}$($Latest.FileName32)`""
10+
"(?i)(^\s*FileFullPath64\s*=\s*`"[$]toolsDir\\).*" = "`${1}$($Latest.FileName64)`""
1011
}
1112

1213
".\legal\VERIFICATION.txt" = @{
1314
"(?i)(\s+x32:).*" = "`${1} $($Latest.URL32)"
1415
"(?i)(checksum32:).*" = "`${1} $($Latest.Checksum32)"
16+
"(?i)(\s+x64:).*" = "`${1} $($Latest.URL64)"
17+
"(?i)(checksum64:).*" = "`${1} $($Latest.Checksum64)"
1518
"(?i)(Get-RemoteChecksum).*" = "`${1} $($Latest.URL32)"
1619
}
1720
}
@@ -22,15 +25,18 @@ function global:au_BeforeUpdate {
2225
}
2326

2427
function global:au_GetLatest {
25-
$download_page = Invoke-WebRequest -Uri $releases -UseBasicParsing
26-
$re = "ES-[\d\.]+\.zip"
27-
$urlPath = $download_page.links | ? href -match $re | Select-Object -First 1 -Expand href
28-
$version = ($urlPath -split '-' | Select-Object -Last 1).trim(".zip")
28+
$download_page = Invoke-WebRequest -Uri $releases -UseBasicParsing
29+
$re = "ES-[\d\.]+\.x86.zip"
30+
$urlPath = $download_page.links | ? href -match $re | Select-Object -First 1 -Expand href
31+
$re64 = "ES-[\d\.]+\.x64.zip"
32+
$urlPath64 = $download_page.links | ? href -match $re64 | Select-Object -First 1 -Expand href
33+
$version = ($urlPath -split '-' | Select-Object -Last 1).trim(".x86.zip")
2934
@{
3035
Version = $version
3136
URL32 = 'https://www.voidtools.com' + $urlPath
37+
URL64 = 'https://www.voidtools.com' + $urlPath64
3238
PackageName = 'es'
3339
}
3440
}
3541

36-
update -ChecksumFor none
42+
update -ChecksumFor none

0 commit comments

Comments
 (0)