diff --git a/src/playbook/Executables/AtlasDesktop/1. Software/Install Software.ps1 b/src/playbook/Executables/AtlasDesktop/1. Software/Install Software.ps1 index 2853728290..0a7a27cb00 100644 --- a/src/playbook/Executables/AtlasDesktop/1. Software/Install Software.ps1 +++ b/src/playbook/Executables/AtlasDesktop/1. Software/Install Software.ps1 @@ -79,6 +79,9 @@ init_item "Ungoogled Chromium" "eloston.ungoogled-chromium" # https://winget.run/pkg/Mozilla/Firefox init_item "Mozilla Firefox" "Mozilla.Firefox" +# https://winget.run/pkg/Waterfox/Waterfox +init_item "Waterfox" "Waterfox.Waterfox" + # https://winget.run/pkg/Brave/brave init_item "Brave Browser" "Brave.Brave" diff --git a/src/playbook/Executables/LIBREWOLF.ps1 b/src/playbook/Executables/LIBREWOLF.ps1 deleted file mode 100644 index c5d3da3d0a..0000000000 --- a/src/playbook/Executables/LIBREWOLF.ps1 +++ /dev/null @@ -1,80 +0,0 @@ -param ( - [switch]$NoUpdater -) - -# disable progress bars -$ProgressPreference = "SilentlyContinue" -# stop on errors, as each command is vital -$ErrorActionPreference = "Stop" - -if ($NoUpdater) { $updaterPath = "$env:ProgramFiles\LibreWolf\librewolf-winupdater" } -$librewolfPath = "$env:ProgramFiles\LibreWolf" -$desktop = [Environment]::GetFolderPath("Desktop") -$startMenu = "$env:ProgramData\Microsoft\Windows\Start Menu\Programs" - -<# if (Test-Path $librewolfPath) { - Write-Host "A version of LibreWolf is seemingly already installed." - Write-Host "This script will not continue." - exit 1 -} #> - -Write-Warning "Getting the latest LibreWolf download link" -$librewolfVersion = Invoke-RestMethod -Uri "https://gitlab.com/api/v4/projects/44042130/releases" | ForEach-Object { $_.name } | Select-Object -First 1 -$librewolfFileName = "librewolf-$librewolfVersion-windows-x86_64-setup.exe" -$librewolfDownload = "https://gitlab.com/api/v4/projects/44042130/packages/generic/librewolf/$librewolfVersion/$librewolfFileName" -if ($NoUpdater) { - Write-Warning "Getting the latest LibreWolf-WinUpdater download link" - $librewolfUpdaterURI = "https://codeberg.org/api/v1/repos/ltguillaume/librewolf-winupdater/releases?draft=false&pre-release=false&page=1&limit=1" - $librewolfUpdaterDownload = (Invoke-RestMethod -Uri "$librewolfUpdaterURI" -Headers @{ "accept" = "application/json" }).Assets | - Where-Object { $_.name -like "*.zip" } | - Select-Object -ExpandProperty browser_download_url -} -# output paths -$outputLibrewolf = "$env:SystemDrive\$librewolfFileName" -if ($NoUpdater) { $outputLibrewolfUpdater = "$env:SystemDrive\librewolf-winupdater.zip" } - -Write-Warning "Downloading the latest LibreWolf setup" -& curl.exe -LSs "$librewolfDownload" -o "$outputLibrewolf" -if ($NoUpdater) { - Write-Warning "Downloading the latest LibreWolf WinUpdater ZIP" - & curl.exe -LSs "$librewolfUpdaterDownload" -o "$outputLibrewolfUpdater" -} - -Write-Warning "Installing LibreWolf silently" -Start-Process -Wait -FilePath $outputLibrewolf -ArgumentList "/S" 2>&1 | Out-Null -if (!(Test-Path $librewolfPath)) { - Write-Host "Installing LibreWolf silently failed." - exit 1 -} -if ($NoUpdater) { - Write-Warning "Installing/extracting Librewolf-WinUpdater" - Expand-Archive -Path $outputLibrewolfUpdater -DestinationPath "$env:ProgramFiles\LibreWolf\librewolf-winupdater" -Force -} - -if ($NoUpdater) { - Write-Warning "Adding automatic updater task" - $Title = "LibreWolf WinUpdater" - $Action = New-ScheduledTaskAction -Execute "$updaterPath\LibreWolf-WinUpdater.exe" -Argument "/Scheduled" - $Settings = New-ScheduledTaskSettingsSet -AllowStartIfOnBatteries -DontStopIfGoingOnBatteries -RunOnlyIfNetworkAvailable - $7Hours = New-ScheduledTaskTrigger -Once -At (Get-Date -Minute 0 -Second 0).AddHours(1) -RepetitionInterval (New-TimeSpan -Hours 7) - $AtLogon = New-ScheduledTaskTrigger -AtLogOn - $AtLogon.Delay = 'PT1M' - $User = (Get-CimInstance -ClassName Win32_ComputerSystem | Select-Object -ExpandProperty UserName) -replace ".*\\" - Register-ScheduledTask -TaskName "$Title ($User)" -Action $Action -Settings $Settings -Trigger $7Hours,$AtLogon -User $User -RunLevel Highest -Force | Out-Null -} - -Write-Warning "Creating shortcuts" -function Create-Shortcut { - param ( [string]$Source, [string]$Destination, [string]$WorkingDir ) - $WshShell = New-Object -comObject WScript.Shell - $Shortcut = $WshShell.CreateShortcut($Destination) - $Shortcut.TargetPath = $Source - $Shortcut.WorkingDirectory = $WorkingDir - $Shortcut.Save() -} -Create-Shortcut -Source "$librewolfPath\librewolf.exe" -Destination "$desktop\LibreWolf.lnk" -WorkingDir $librewolfPath -if ($NoUpdater) { Create-Shortcut -Source "$updaterPath\Librewolf-WinUpdater.exe" -Destination "$startMenu\LibreWolf\LibreWolf WinUpdater.lnk" -WorkingDir $librewolfPath } - -Write-Warning "Removing temporary installer files" -Remove-Item "$outputLibrewolf" -Force -if ($NoUpdater) { Remove-Item "$outputLibrewolfUpdater" -Force } diff --git a/src/playbook/Executables/SOFTWARE.ps1 b/src/playbook/Executables/SOFTWARE.ps1 index 86c165cd98..6778ef4ccd 100644 --- a/src/playbook/Executables/SOFTWARE.ps1 +++ b/src/playbook/Executables/SOFTWARE.ps1 @@ -1,6 +1,7 @@ param ( [switch]$Chrome, - [switch]$Brave + [switch]$Brave, + [switch]$Waterfox ) # ----------------------------------------------------------------------------------------------------------- # @@ -12,14 +13,6 @@ $tempDir = Join-Path -Path $env:TEMP -ChildPath $([System.IO.Path]::GetRandomFil New-Item $tempDir -ItemType Directory -Force | Out-Null Set-Location $tempDir -# Chrome -if ($Chrome) { - Write-Host "Installing Google Chrome..." - & curl.exe -LSs "https://dl.google.com/dl/chrome/install/googlechromestandaloneenterprise64.msi" -o "$tempDir\chrome.msi" - Start-Process -FilePath "$tempDir\chrome.msi" -WindowStyle Hidden -ArgumentList '/qn' -Wait 2>&1 | Out-Null - exit -} - # Brave if ($Brave) { Write-Host "Installing Brave..." @@ -45,6 +38,23 @@ if ($Brave) { exit } +# Waterfox +if ($Watefox) { + Write-Host "Installing Waterfox..." + & curl.exe -LSs "https://cdn1.waterfox.net/waterfox/releases/latest/windows" -o "$tempDir\watefox.exe" + Start-Process -FilePath "$tempDir\watefox.exe" -WindowStyle Hidden -ArgumentList '/S /ALLUSERS=1' -Wait 2>&1 | Out-Null + exit +} + +# Chrome +if ($Chrome) { + Write-Host "Installing Google Chrome..." + & curl.exe -LSs "https://dl.google.com/dl/chrome/install/googlechromestandaloneenterprise64.msi" -o "$tempDir\chrome.msi" + Start-Process -FilePath "$tempDir\chrome.msi" -WindowStyle Hidden -ArgumentList '/qn' -Wait 2>&1 | Out-Null + exit +} + + #################### ## Software ## #################### diff --git a/src/playbook/Executables/TASKBARPINS.cmd b/src/playbook/Executables/TASKBARPINS.cmd index d525c95473..ff530bf24f 100644 --- a/src/playbook/Executables/TASKBARPINS.cmd +++ b/src/playbook/Executables/TASKBARPINS.cmd @@ -38,9 +38,9 @@ for /f "usebackq tokens=2 delims=\" %%a in (`reg query "HKEY_USERS" ^| findstr / reg add "HKU\%%a\%rootKey%" /v "Favorites" /t REG_BINARY /d "003A0100003A001F80C827341F105C1042AA032EE45287D668260001002600EFBE120000001AA557D820E0D90138DCEBF8DDE0D9018F25810DDEE0D9011400560031000000000026578C8210005461736B42617200400009000400EFBE26577C8226578C822E000000D499010000000C000000000000000000000000000000E3721D005400610073006B0042006100720000001600A80032007809000026578F82200042726176652E6C6E6B00440009000400EFBE26577C8226578F822E0000005E62060000000700000000000000000000000000000071751D00420072006100760065002E006C006E006B0000001800120000002B00EFBE8F25810DDEE0D9011800180000001D00EFBE02004200720061007600650000001800220000001E00EFBE02005500730065007200500069006E006E006500640000001800000000A40100003A001F80C827341F105C1042AA032EE45287D668260001002600EFBE1200000056F21270246AD8010F37A185246AD8012B113CA5246AD80114005600310000000000B154E29B11005461736B42617200400009000400EFBEB154C69BB154E29B2E000000F4940100000001000000000000000000000000000000D5BA89005400610073006B00420061007200000016001201320097010000874F0749200046494C4545587E312E4C4E4B00007C0009000400EFBEB154E29BB154E29B2E00000097900100000002000000000000000000520000000000589C4400460069006C00650020004500780070006C006F007200650072002E006C006E006B00000040007300680065006C006C00330032002E0064006C006C002C002D003200320030003600370000001C00120000002B00EFBE2B113CA5246AD8011C00420000001D00EFBE02004D006900630072006F0073006F00660074002E00570069006E0064006F00770073002E004500780070006C006F0072006500720000001C00260000001E00EFBE0200530079007300740065006D00500069006E006E006500640000001C000000FF" /f ) - if "%input%" == "LibreWolf" ( - reg add "HKU\%%a\%rootKey%" /v "FavoritesResolve" /t REG_BINARY /d "EA0200004C0000000114020000000000C0000000000000468300800020000000529D8535B6E0D901529D8535B6E0D901529D8535B6E0D901B904000000000000010000000000000000000000000000005C013A001F80C827341F105C1042AA032EE45287D668260001002600EFBE120000001AA557D820E0D90158B7CE0121E0D90117C3C83EABE0D901140056003100000000002657655C11005461736B42617200400009000400EFBE2557E88D2657665C2E000000D4990100000006000000000000000000000000000000AC6601005400610073006B0042006100720000001600CA003200B90400002657695C20004C69627265576F6C662E6C6E6B004C0009000400EFBE2657695C2657695C2E000000DA780000000008000000000000000000000000000000AE018D004C00690062007200650057006F006C0066002E006C006E006B0000001C00220000001E00EFBE02005500730065007200500069006E006E006500640000001C00120000002B00EFBE529D8535B6E0D9011C002E0000001D00EFBE0200380033004300310043003000460033004600410038003500320034004200310000001C000000970000001C000000010000001C0000002D00000000000000960000001100000003000000BEE87AE81000000000433A5C55736572735C557365725C417070446174615C526F616D696E675C4D6963726F736F66745C496E7465726E6574204578706C6F7265725C517569636B204C61756E63685C557365722050696E6E65645C5461736B4261725C4C69627265576F6C662E6C6E6B000060000000030000A058000000000000006465736B746F702D31646C64346430003AEC768D387A5741A7D5E116AEF015FAB13DA7E29E4CEE11AE93000C29335CED3AEC768D387A5741A7D5E116AEF015FAB13DA7E29E4CEE11AE93000C29335CED45000000090000A03900000031535053B1166D44AD8D7048A748402EA43D788C1D000000680000000048000000E3F2055EF8D5A6499004604854A49D84000000000000000000000000320300004C0000000114020000000000C0000000000000468300800020000000549E39A5246AD8012B113CA5246AD801A8B6C6DADDACD501970100000000000001000000000000000000000000000000A0013A001F80C827341F105C1042AA032EE45287D668260001002600EFBE1200000056F21270246AD8010F37A185246AD8012B113CA5246AD80114005600310000000000B154E29B11005461736B42617200400009000400EFBEB154C69BB154E29B2E000000F4940100000001000000000000000000000000000000D5BA89005400610073006B00420061007200000016000E01320097010000874F0749200046494C4545587E312E4C4E4B00007C0009000400EFBEB154E29BB154E29B2E00000097900100000002000000000000000000520000000000589C4400460069006C00650020004500780070006C006F007200650072002E006C006E006B00000040007300680065006C006C00330032002E0064006C006C002C002D003200320030003600370000001C00220000001E00EFBE02005500730065007200500069006E006E006500640000001C00120000002B00EFBE2B113CA5246AD8011C00420000001D00EFBE02004D006900630072006F0073006F00660074002E00570069006E0064006F00770073002E004500780070006C006F0072006500720000001C0000009B0000001C000000010000001C0000002D000000000000009A0000001100000003000000E4A63B761000000000433A5C55736572735C757365725C417070446174615C526F616D696E675C4D6963726F736F66745C496E7465726E6574204578706C6F7265725C517569636B204C61756E63685C557365722050696E6E65645C5461736B4261725C46696C65204578706C6F7265722E6C6E6B000060000000030000A058000000000000006465736B746F702D62356E36683339006E1A1EE27BFFA94ABB0361D86F25337E500764DB17D6EC11A598000C2907D6A06E1A1EE27BFFA94ABB0361D86F25337E500764DB17D6EC11A598000C2907D6A045000000090000A03900000031535053B1166D44AD8D7048A748402EA43D788C1D000000680000000048000000CE2181FCD4BF31408F25FF009E4345CA000000000000000000000000" /f - reg add "HKU\%%a\%rootKey%" /v "Favorites" /t REG_BINARY /d "005C0100003A001F80C827341F105C1042AA032EE45287D668260001002600EFBE120000001AA557D820E0D90158B7CE0121E0D90117C3C83EABE0D901140056003100000000002657655C11005461736B42617200400009000400EFBE2557E88D2657665C2E000000D4990100000006000000000000000000000000000000AC6601005400610073006B0042006100720000001600CA003200B90400002657695C20004C69627265576F6C662E6C6E6B004C0009000400EFBE2657695C2657695C2E000000DA780000000008000000000000000000000000000000AE018D004C00690062007200650057006F006C0066002E006C006E006B0000001C00120000002B00EFBE529D8535B6E0D9011C002E0000001D00EFBE0200380033004300310043003000460033004600410038003500320034004200310000001C00220000001E00EFBE02005500730065007200500069006E006E006500640000001C00000000A40100003A001F80C827341F105C1042AA032EE45287D668260001002600EFBE1200000056F21270246AD8010F37A185246AD8012B113CA5246AD80114005600310000000000B154E29B11005461736B42617200400009000400EFBEB154C69BB154E29B2E000000F4940100000001000000000000000000000000000000D5BA89005400610073006B00420061007200000016001201320097010000874F0749200046494C4545587E312E4C4E4B00007C0009000400EFBEB154E29BB154E29B2E00000097900100000002000000000000000000520000000000589C4400460069006C00650020004500780070006C006F007200650072002E006C006E006B00000040007300680065006C006C00330032002E0064006C006C002C002D003200320030003600370000001C00120000002B00EFBE2B113CA5246AD8011C00420000001D00EFBE02004D006900630072006F0073006F00660074002E00570069006E0064006F00770073002E004500780070006C006F0072006500720000001C00260000001E00EFBE0200530079007300740065006D00500069006E006E006500640000001C000000FF" /f + if "%input%" == "Waterfox" ( + reg add "HKU\%%a\%rootKey%" /v "FavoritesResolve" /t REG_BINARY /d "E70200004C0000000114020000000000C00000000000004683008000200000003D9CA75CE60CDA01EAE0A75CE60CDA01EC6B1558E60CDA01CF03000000000000010000000000000000000000000000005A013A001F80C827341F105C1042AA032EE45287D668260001002600EFBE12000000B7D01F849F07DA016E4824AA9F07DA01EAE0A75CE60CDA011400560031000000000061573D8911005461736B42617200400009000400EFBE5A574500615740892E0000004CB80100000002000000000000000000000000000000A0A418005400610073006B0042006100720000001600C8003200CF0300006157568920005761746572666F782E6C6E6B00004A0009000400EFBE61575989615759892E00000019480100000004000000000000000000000000000000141627015700610074006500720066006F0078002E006C006E006B0000001C00220000001E00EFBE02005500730065007200500069006E006E006500640000001C00120000002B00EFBEEAE0A75CE60CDA011C002E0000001D00EFBE0200360046003900340030004100430032003700410039003800440044003600310000001C000000960000001C000000010000001C0000002D000000000000009500000011000000030000003BDA87161000000000433A5C55736572735C557365725C417070446174615C526F616D696E675C4D6963726F736F66745C496E7465726E6574204578706C6F7265725C517569636B204C61756E63685C557365722050696E6E65645C5461736B4261725C5761746572666F782E6C6E6B000060000000030000A058000000000000006465736B746F702D767374726D7464007C2BDE4447FEA44CA2303A644D62D9812938C4831978EE11AFFA000C290329287C2BDE4447FEA44CA2303A644D62D9812938C4831978EE11AFFA000C2903292845000000090000A03900000031535053B1166D44AD8D7048A748402EA43D788C1D00000068000000004800000032AD577505D8114988A52C1801858012000000000000000000000000320300004C0000000114020000000000C0000000000000468300800020000000DA1129AA9F07DA0107732BAA9F07DA015CF4E1FBD161D801970100000000000001000000000000000000000000000000A0013A001F80C827341F105C1042AA032EE45287D668260001002600EFBE12000000B7D01F849F07DA016E4824AA9F07DA0107732BAA9F07DA01140056003100000000005A57450011005461736B42617200400009000400EFBE5A5745005A5745002E0000004CB80100000002000000000000000000000000000000F9792D005400610073006B00420061007200000016000E01320097010000A754662A200046494C4545587E312E4C4E4B00007C0009000400EFBE5A5745005A5745002E0000004EB80100000002000000000000000000520000000000A413A200460069006C00650020004500780070006C006F007200650072002E006C006E006B00000040007300680065006C006C00330032002E0064006C006C002C002D003200320030003600370000001C00220000001E00EFBE02005500730065007200500069006E006E006500640000001C00120000002B00EFBE07732BAA9F07DA011C00420000001D00EFBE02004D006900630072006F0073006F00660074002E00570069006E0064006F00770073002E004500780070006C006F0072006500720000001C0000009B0000001C000000010000001C0000002D000000000000009A00000011000000030000003BDA87161000000000433A5C55736572735C557365725C417070446174615C526F616D696E675C4D6963726F736F66745C496E7465726E6574204578706C6F7265725C517569636B204C61756E63685C557365722050696E6E65645C5461736B4261725C46696C65204578706C6F7265722E6C6E6B000060000000030000A058000000000000006465736B746F702D767374726D7464007C2BDE4447FEA44CA2303A644D62D981B21C7C929273EE11AFF6000C290329287C2BDE4447FEA44CA2303A644D62D981B21C7C929273EE11AFF6000C2903292845000000090000A03900000031535053B1166D44AD8D7048A748402EA43D788C1D00000068000000004800000032AD577505D8114988A52C1801858012000000000000000000000000" /f + reg add "HKU\%%a\%rootKey%" /v "Favorites" /t REG_BINARY /d "005A0100003A001F80C827341F105C1042AA032EE45287D668260001002600EFBE12000000B7D01F849F07DA016E4824AA9F07DA01EAE0A75CE60CDA011400560031000000000061573D8911005461736B42617200400009000400EFBE5A574500615740892E0000004CB80100000002000000000000000000000000000000A0A418005400610073006B0042006100720000001600C8003200CF0300006157568920005761746572666F782E6C6E6B00004A0009000400EFBE61575989615759892E00000019480100000004000000000000000000000000000000141627015700610074006500720066006F0078002E006C006E006B0000001C00120000002B00EFBEEAE0A75CE60CDA011C002E0000001D00EFBE0200360046003900340030004100430032003700410039003800440044003600310000001C00220000001E00EFBE02005500730065007200500069006E006E006500640000001C00000000A40100003A001F80C827341F105C1042AA032EE45287D668260001002600EFBE12000000B7D01F849F07DA016E4824AA9F07DA0107732BAA9F07DA01140056003100000000005A57450011005461736B42617200400009000400EFBE5A5745005A5745002E0000004CB80100000002000000000000000000000000000000F9792D005400610073006B00420061007200000016001201320097010000A754662A200046494C4545587E312E4C4E4B00007C0009000400EFBE5A5745005A5745002E0000004EB80100000002000000000000000000520000000000A413A200460069006C00650020004500780070006C006F007200650072002E006C006E006B00000040007300680065006C006C00330032002E0064006C006C002C002D003200320030003600370000001C00120000002B00EFBE07732BAA9F07DA011C00420000001D00EFBE02004D006900630072006F0073006F00660074002E00570069006E0064006F00770073002E004500780070006C006F0072006500720000001C00260000001E00EFBE0200530079007300740065006D00500069006E006E006500640000001C000000FF" /f ) if "%input%" == "Google Chrome" ( diff --git a/src/playbook/Images/librewolf.png b/src/playbook/Images/librewolf.png deleted file mode 100644 index 1c6872d4a5..0000000000 Binary files a/src/playbook/Images/librewolf.png and /dev/null differ diff --git a/src/playbook/Images/waterfox.png b/src/playbook/Images/waterfox.png new file mode 100644 index 0000000000..aad4bead83 Binary files /dev/null and b/src/playbook/Images/waterfox.png differ diff --git a/src/playbook/playbook.conf b/src/playbook/playbook.conf index 52b46dcbc9..ec1cb8522f 100644 --- a/src/playbook/playbook.conf +++ b/src/playbook/playbook.conf @@ -100,11 +100,11 @@ #3b3e4f - LibreWolf - browser-librewolf - librewolf - #00acff - #9CDEFF + Waterfox + browser-waterfox + waterfox + #4676ed + #acf5fe Chrome @@ -116,19 +116,5 @@ - - - - - Automatic Updates - librewolf-winupdater - - - Manual Updates with WinGet - librewolf-winget - - - -