From 3bfa7ce3d44eb5c9fdf208163acb50e5c4e8119d Mon Sep 17 00:00:00 2001 From: Recurzion <4392567+Recurzion@users.noreply.github.com> Date: Wed, 15 Nov 2023 16:55:43 -0500 Subject: [PATCH 1/8] version bump to fix broken pkg --- automatic/tor-browser/tools/chocolateyInstall.ps1 | 8 ++++---- automatic/tor-browser/tor-browser.nuspec | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/automatic/tor-browser/tools/chocolateyInstall.ps1 b/automatic/tor-browser/tools/chocolateyInstall.ps1 index 673674ffc8a..768336fed54 100644 --- a/automatic/tor-browser/tools/chocolateyInstall.ps1 +++ b/automatic/tor-browser/tools/chocolateyInstall.ps1 @@ -8,10 +8,10 @@ $destinationFolder = GetInstallDirectory -toolsPath $toolsDir $packageArgs = @{ PackageName = 'tor-browser' FileType = 'exe' - Url = 'https://www.torproject.org/dist/torbrowser/12.5.6/torbrowser-install-12.5.6_ALL.exe' - Url64 = 'https://www.torproject.org/dist/torbrowser/12.5.6/torbrowser-install-win64-12.5.6_ALL.exe' - Checksum = 'e939c0994619047fabedc43dbfc82be63413ab0a5bc777a4b8ad67d3dde2e974' - Checksum64 = '88c33af6f1963eb94683be1fecfada36d17546579098372dcad61ae2137ad7b3' + Url = 'https://dist.torproject.org/torbrowser/13.0.1/tor-browser-windows-x86_64-portable-13.0.1.exe' + Url64 = 'https://dist.torproject.org/torbrowser/13.0.1/tor-browser-windows-x86_64-portable-13.0.1.exe' + Checksum = '920b0907a65b7cf63076fdc80a605283cf51d9742e5726e7b48fb53e3a0071af' + Checksum64 = '920b0907a65b7cf63076fdc80a605283cf51d9742e5726e7b48fb53e3a0071af' ChecksumType = 'sha256' SilentArgs = "/S","/D=$destinationFolder" } diff --git a/automatic/tor-browser/tor-browser.nuspec b/automatic/tor-browser/tor-browser.nuspec index a134f3c5949..1b2abbc9f2b 100644 --- a/automatic/tor-browser/tor-browser.nuspec +++ b/automatic/tor-browser/tor-browser.nuspec @@ -3,7 +3,7 @@ tor-browser - 12.5.6 + 13.0.1 Tor Browser chocolatey-community Tor Project From a0525d1efdc77b2594427293d7223799ef344df9 Mon Sep 17 00:00:00 2001 From: Recurzion <4392567+Recurzion@users.noreply.github.com> Date: Wed, 15 Nov 2023 17:40:26 -0500 Subject: [PATCH 2/8] fixing version regex --- automatic/tor-browser/update.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/automatic/tor-browser/update.ps1 b/automatic/tor-browser/update.ps1 index a3eb4f0f561..622ee1a40bf 100644 --- a/automatic/tor-browser/update.ps1 +++ b/automatic/tor-browser/update.ps1 @@ -23,8 +23,8 @@ function global:au_GetLatest { $download_page = Invoke-WebRequest -Uri $releases -UseBasicParsing $allExes = $download_page.Links | Where-Object href -match "\.exe$" | Select-Object -expand href - $url32 = $allExes | Where-Object { $_ -match "torbrowser-install-\d.*_All.exe$" } | Select-Object -First 1 - $url64 = $allExes | Where-Object { $_ -match "torbrowser-install-win64.*_All.exe$" } | Select-Object -First 1 + $url32 = $allExes | Where-Object { $_ -match "tor-browser-windows-i686-portable-\d.*.exe$" } | Select-Object -First 1 + $url64 = $allExes | Where-Object { $_ -match "tor-browser-windows-x86_64-portable-\d.*.exe$" } | Select-Object -First 1 $version = $url64 -split '\/' | Select-Object -last 1 -skip 1 @{ From 3c8739ea494a776aff6f7c29e472ee93a2762359 Mon Sep 17 00:00:00 2001 From: Recurzion <4392567+Recurzion@users.noreply.github.com> Date: Wed, 15 Nov 2023 17:49:59 -0500 Subject: [PATCH 3/8] fixing urls --- automatic/tor-browser/update.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/automatic/tor-browser/update.ps1 b/automatic/tor-browser/update.ps1 index 622ee1a40bf..2dde199979d 100644 --- a/automatic/tor-browser/update.ps1 +++ b/automatic/tor-browser/update.ps1 @@ -29,8 +29,8 @@ function global:au_GetLatest { @{ Version = "$version" - URL32 = $baseUrl + $url32 - URL64 = $baseUrl + $url64 + URL32 = $url32 + URL64 = $url64 } } From cbc5d290a93f95bb6689c89cec352139c94ecd97 Mon Sep 17 00:00:00 2001 From: Recurzion <4392567+Recurzion@users.noreply.github.com> Date: Tue, 12 Dec 2023 17:25:14 -0500 Subject: [PATCH 4/8] Bump to 13.0.6 with archive URLs --- automatic/tor-browser/tools/chocolateyInstall.ps1 | 8 ++++---- automatic/tor-browser/tor-browser.nuspec | 2 +- automatic/tor-browser/update.ps1 | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/automatic/tor-browser/tools/chocolateyInstall.ps1 b/automatic/tor-browser/tools/chocolateyInstall.ps1 index 768336fed54..253253d32f5 100644 --- a/automatic/tor-browser/tools/chocolateyInstall.ps1 +++ b/automatic/tor-browser/tools/chocolateyInstall.ps1 @@ -8,10 +8,10 @@ $destinationFolder = GetInstallDirectory -toolsPath $toolsDir $packageArgs = @{ PackageName = 'tor-browser' FileType = 'exe' - Url = 'https://dist.torproject.org/torbrowser/13.0.1/tor-browser-windows-x86_64-portable-13.0.1.exe' - Url64 = 'https://dist.torproject.org/torbrowser/13.0.1/tor-browser-windows-x86_64-portable-13.0.1.exe' - Checksum = '920b0907a65b7cf63076fdc80a605283cf51d9742e5726e7b48fb53e3a0071af' - Checksum64 = '920b0907a65b7cf63076fdc80a605283cf51d9742e5726e7b48fb53e3a0071af' + Url = 'https://archive.torproject.org/tor-package-archive/torbrowser/13.0.6/tor-browser-windows-x86_64-portable-13.0.6.exe' + Url64 = 'https://archive.torproject.org/tor-package-archive/torbrowser/13.0.6/tor-browser-windows-x86_64-portable-13.0.6.exe' + Checksum = 'a7c3705ff210413c77fde4b52e0f6f1767db26f0fa5b01f8f910d5b0186485b5' + Checksum64 = 'a7c3705ff210413c77fde4b52e0f6f1767db26f0fa5b01f8f910d5b0186485b5' ChecksumType = 'sha256' SilentArgs = "/S","/D=$destinationFolder" } diff --git a/automatic/tor-browser/tor-browser.nuspec b/automatic/tor-browser/tor-browser.nuspec index 1b2abbc9f2b..8e639ec9c2b 100644 --- a/automatic/tor-browser/tor-browser.nuspec +++ b/automatic/tor-browser/tor-browser.nuspec @@ -3,7 +3,7 @@ tor-browser - 13.0.1 + 13.0.6 Tor Browser chocolatey-community Tor Project diff --git a/automatic/tor-browser/update.ps1 b/automatic/tor-browser/update.ps1 index 2dde199979d..79e497ed9ed 100644 --- a/automatic/tor-browser/update.ps1 +++ b/automatic/tor-browser/update.ps1 @@ -1,6 +1,6 @@ import-module au -$releases = "https://www.torproject.org/download/languages/" +$releases = "https://archive.torproject.org/tor-package-archive/torbrowser/13.0.6/" $baseUrl = "https://www.torproject.org" function global:au_SearchReplace { @@ -23,7 +23,7 @@ function global:au_GetLatest { $download_page = Invoke-WebRequest -Uri $releases -UseBasicParsing $allExes = $download_page.Links | Where-Object href -match "\.exe$" | Select-Object -expand href - $url32 = $allExes | Where-Object { $_ -match "tor-browser-windows-i686-portable-\d.*.exe$" } | Select-Object -First 1 + $url32 = $allExes | Where-Object { $_ -match "tor-browser-windows-x86_64-portable-\d.*.exe$" } | Select-Object -First 1 $url64 = $allExes | Where-Object { $_ -match "tor-browser-windows-x86_64-portable-\d.*.exe$" } | Select-Object -First 1 $version = $url64 -split '\/' | Select-Object -last 1 -skip 1 From 78c55cc24688672993a421dc4588d6cbc50565c9 Mon Sep 17 00:00:00 2001 From: Recurzion <4392567+Recurzion@users.noreply.github.com> Date: Tue, 12 Dec 2023 18:43:46 -0500 Subject: [PATCH 5/8] Fixing version and urls --- automatic/tor-browser/update.ps1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/automatic/tor-browser/update.ps1 b/automatic/tor-browser/update.ps1 index 79e497ed9ed..c3842cb827b 100644 --- a/automatic/tor-browser/update.ps1 +++ b/automatic/tor-browser/update.ps1 @@ -23,9 +23,9 @@ function global:au_GetLatest { $download_page = Invoke-WebRequest -Uri $releases -UseBasicParsing $allExes = $download_page.Links | Where-Object href -match "\.exe$" | Select-Object -expand href - $url32 = $allExes | Where-Object { $_ -match "tor-browser-windows-x86_64-portable-\d.*.exe$" } | Select-Object -First 1 - $url64 = $allExes | Where-Object { $_ -match "tor-browser-windows-x86_64-portable-\d.*.exe$" } | Select-Object -First 1 - $version = $url64 -split '\/' | Select-Object -last 1 -skip 1 + $url32 = $releases + ($allExes | Where-Object { $_ -match "tor-browser-windows-x86_64-portable-\d.*.exe$" } | Select-Object -First 1) + $url64 = $releases + ($allExes | Where-Object { $_ -match "tor-browser-windows-x86_64-portable-\d.*.exe$" } | Select-Object -First 1) + $version = $releases -split '\/' | Select-Object -last 1 -skip 1 @{ Version = "$version" From cc449fe2a1470f6eecc25f569baafe8bf13417c8 Mon Sep 17 00:00:00 2001 From: Recurzion <4392567+Recurzion@users.noreply.github.com> Date: Sat, 30 Dec 2023 22:57:58 -0500 Subject: [PATCH 6/8] updating PR with suggested changes --- automatic/tor-browser/tor-browser.nuspec | 2 +- automatic/tor-browser/update.ps1 | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/automatic/tor-browser/tor-browser.nuspec b/automatic/tor-browser/tor-browser.nuspec index 8e639ec9c2b..a134f3c5949 100644 --- a/automatic/tor-browser/tor-browser.nuspec +++ b/automatic/tor-browser/tor-browser.nuspec @@ -3,7 +3,7 @@ tor-browser - 13.0.6 + 12.5.6 Tor Browser chocolatey-community Tor Project diff --git a/automatic/tor-browser/update.ps1 b/automatic/tor-browser/update.ps1 index c3842cb827b..05f4ad4fc17 100644 --- a/automatic/tor-browser/update.ps1 +++ b/automatic/tor-browser/update.ps1 @@ -1,7 +1,7 @@ import-module au -$releases = "https://archive.torproject.org/tor-package-archive/torbrowser/13.0.6/" -$baseUrl = "https://www.torproject.org" +$releases = "https://www.torproject.org/download/languages/" +$baseUrl = "https://archive.torproject.org/tor-package-archive/torbrowser/" function global:au_SearchReplace { @{ @@ -23,14 +23,14 @@ function global:au_GetLatest { $download_page = Invoke-WebRequest -Uri $releases -UseBasicParsing $allExes = $download_page.Links | Where-Object href -match "\.exe$" | Select-Object -expand href - $url32 = $releases + ($allExes | Where-Object { $_ -match "tor-browser-windows-x86_64-portable-\d.*.exe$" } | Select-Object -First 1) - $url64 = $releases + ($allExes | Where-Object { $_ -match "tor-browser-windows-x86_64-portable-\d.*.exe$" } | Select-Object -First 1) - $version = $releases -split '\/' | Select-Object -last 1 -skip 1 + $url32 = (($allExes | Where-Object { $_ -match "tor-browser-windows-i686-portable-\d.*.exe$" } | Select-Object -First 1) -split("\/",5) | Select -Index 4) + $url64 = (($allExes | Where-Object { $_ -match "tor-browser-windows-x86_64-portable-\d.*.exe$" } | Select-Object -First 1) -split("\/",5) | Select -Index 4) + $version = $url64 -split '\/' | Select-Object -last 1 -skip 1 @{ Version = "$version" - URL32 = $url32 - URL64 = $url64 + URL32 = $baseUrl + $url32 + URL64 = $baseUrl + $url64 } } From 09cfad25033b4841ca379f0baf51a0ad0fb1fd39 Mon Sep 17 00:00:00 2001 From: Recurzion <4392567+Recurzion@users.noreply.github.com> Date: Tue, 9 Jan 2024 20:00:40 -0500 Subject: [PATCH 7/8] reverting install script since it will be updated automatically --- automatic/tor-browser/tools/chocolateyInstall.ps1 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/automatic/tor-browser/tools/chocolateyInstall.ps1 b/automatic/tor-browser/tools/chocolateyInstall.ps1 index 253253d32f5..cc2626df2c4 100644 --- a/automatic/tor-browser/tools/chocolateyInstall.ps1 +++ b/automatic/tor-browser/tools/chocolateyInstall.ps1 @@ -8,10 +8,10 @@ $destinationFolder = GetInstallDirectory -toolsPath $toolsDir $packageArgs = @{ PackageName = 'tor-browser' FileType = 'exe' - Url = 'https://archive.torproject.org/tor-package-archive/torbrowser/13.0.6/tor-browser-windows-x86_64-portable-13.0.6.exe' - Url64 = 'https://archive.torproject.org/tor-package-archive/torbrowser/13.0.6/tor-browser-windows-x86_64-portable-13.0.6.exe' - Checksum = 'a7c3705ff210413c77fde4b52e0f6f1767db26f0fa5b01f8f910d5b0186485b5' - Checksum64 = 'a7c3705ff210413c77fde4b52e0f6f1767db26f0fa5b01f8f910d5b0186485b5' + Url = 'https://www.torproject.org/dist/torbrowser/12.5.6/torbrowser-install-12.5.6_ALL.exe' + Url64 = 'https://www.torproject.org/dist/torbrowser/12.5.6/torbrowser-install-win64-12.5.6_ALL.exe' + Checksum = 'e939c0994619047fabedc43dbfc82be63413ab0a5bc777a4b8ad67d3dde2e974' + Checksum64 = '88c33af6f1963eb94683be1fecfada36d17546579098372dcad61ae2137ad7b3' ChecksumType = 'sha256' SilentArgs = "/S","/D=$destinationFolder" } @@ -37,4 +37,4 @@ $WhoAmI = whoami $Acl = Get-Acl "$toolsDir\tor-browser" $Ar = New-Object system.security.accesscontrol.filesystemaccessrule($WhoAmI, "Modify", 'ContainerInherit,ObjectInherit', 'None', "Allow") $Acl.SetAccessRule($Ar) -Set-Acl "$toolsDir\tor-browser" $Acl +Set-Acl "$toolsDir\tor-browser" $Acl \ No newline at end of file From d750c2048e50fd65ffd0133f88496a109a633c89 Mon Sep 17 00:00:00 2001 From: Recurzion <4392567+Recurzion@users.noreply.github.com> Date: Tue, 9 Jan 2024 20:02:39 -0500 Subject: [PATCH 8/8] newline --- automatic/tor-browser/tools/chocolateyInstall.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automatic/tor-browser/tools/chocolateyInstall.ps1 b/automatic/tor-browser/tools/chocolateyInstall.ps1 index cc2626df2c4..673674ffc8a 100644 --- a/automatic/tor-browser/tools/chocolateyInstall.ps1 +++ b/automatic/tor-browser/tools/chocolateyInstall.ps1 @@ -37,4 +37,4 @@ $WhoAmI = whoami $Acl = Get-Acl "$toolsDir\tor-browser" $Ar = New-Object system.security.accesscontrol.filesystemaccessrule($WhoAmI, "Modify", 'ContainerInherit,ObjectInherit', 'None', "Allow") $Acl.SetAccessRule($Ar) -Set-Acl "$toolsDir\tor-browser" $Acl \ No newline at end of file +Set-Acl "$toolsDir\tor-browser" $Acl