From 48727514744b30edda4637085470c2854c906f75 Mon Sep 17 00:00:00 2001 From: "Kenneth Benzie (Benie)" Date: Fri, 9 Aug 2024 11:29:38 +0100 Subject: [PATCH] Update bootstrap-Windows.ps1 script * Add 1Password install step * Add Scoop install step * Remove SSH key generation step * Make 1Password, Hyper-V, Containers, and SSH Server steps optional * Refactor to run Scoop install as unelevated then relaunch as elevated for remaining tasks --- README.md | 2 +- bootstrap-Windows.ps1 | 81 ++++++++++++++++++++++++++++++++----------- 2 files changed, 61 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 51ea2af..1d88a2c 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ $ curl -O https://code.infektor.net/config/bootstrap/raw/master/bootstrap-Fedora To bootstrap a Windows instance: ```console -$ Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://code.infektor.net/config/bootstrap/raw/master/bootstrap-Windows.ps1')) +$ Set-ExecutionPolicy Bypass -Scope Process -Force; Invoke-WebRequest -Uri "https://git.infektor.net/config/bootstrap/raw/update/bootstrap-Windows.ps1" -OutFile "./bootstrap-Windows.ps1"; ./bootstrap-Windows.ps1 ``` ## Package diff --git a/bootstrap-Windows.ps1 b/bootstrap-Windows.ps1 index f1f83b9..52b95ca 100644 --- a/bootstrap-Windows.ps1 +++ b/bootstrap-Windows.ps1 @@ -1,26 +1,65 @@ -[CmdletBinding()] -Param( - [Parameter(Mandatory=$true)] - [String]$email, - [String]$sshKeyType = "ed25519" -) +$IsElevated = [bool]([Security.Principal.WindowsPrincipal] ` + [Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole] "Administrator") +$Choices = '&Yes', '&No' -# Install Chocolatey -Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1')) +if (-Not $IsElevated) { + Write-Host "Not running as Administrator. Performing unprivileged actions." -# Enable Hyper-V and containters -Enable-WindowsOptionalFeature -Online -FeatureName Microsoft-Hyper-V -All -Enable-WindowsOptionalFeature -Online -FeatureName Containers -All + # Install Scoop + Write-Host "`nInstall Scoop" + $ScoopInstaller = "$env:USERPROFILE/Downloads/ScoopInstaller.ps1" + Invoke-WebRequest -Uri https://get.scoop.sh -OutFile $ScoopInstaller + &$ScoopInstaller -ScoopDir "$env:LocalAppData/Scoop" -ScoopGlobalDir "$env:ProgramData/Scoop" -# Install OpenSSH and start service -choco install --yes "--package-parameters=/SSHServerFeature" openssh -Start-Service sshd -Set-Service -Name sshd -StartupType 'Automatic' + $Decision = $Host.UI.PromptForChoice('Relaunch as Administrator', 'Proceed?', $Choices, 0) + if ($Decision -eq 0) { + $Bootstrap = $MyInvocation.MyCommand.Path + Start-Process -Verb RunAs powershell.exe "-ExecutionPolicy ByPass -NoProfile -File $Bootstrap" + } +} else { + Write-Host "Running as Administrator. Performing privileged actions." -# generate keys and authorize them -ssh-keygen -t "$sshKeyType" -C "$email" -f "$env:USERPROFILE/.ssh/$sshKeyType" -# TODO: authorize public key for admin + # Install 1Password + $Decision = $Host.UI.PromptForChoice('Install 1Password', 'Proceed?', $Choices, 0) + if ($Decision -eq 0) { + $1passwordInstaller = "$env:USERPROFILE/Downloads/1PasswordSetup-latest.exe" + Invoke-WebRequest -Uri "https://downloads.1password.com/win/1PasswordSetup-latest.exe" -OutFile "$1passwordInstaller" + &$1passwordInstaller + Remove-Item $1passwordInstaller + } else { + echo 'Skipping 1Password' + } -# Install Windows-Terminal and Debian -choco install --yes microsoft-windows-terminal -wsl --install --distribution Debia + # Enable Hyper-V + $Decision = $Host.UI.PromptForChoice('Enable Hyper-V', 'Proceed?', $Choices, 0) + if ($Decision -eq 0) { + Enable-WindowsOptionalFeature -Online -FeatureName Microsoft-Hyper-V -All + } else { + echo 'Skipping Hyper-V' + } + + # Enable Containters + $Decision = $Host.UI.PromptForChoice('Enable Containers', 'Proceed?', $Choices, 0) + if ($Decision -eq 0) { + Enable-WindowsOptionalFeature -Online -FeatureName Containers -All + } else { + echo 'Skipping Containers' + } + + # Install Chocolatey + Write-Host "`nInstall Chocolatey" + iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1')) + + # Install SSH Server + $Decision = $Host.UI.PromptForChoice('Install SSH Server', 'Proceed?', $Choices, 0) + if ($Decision -eq 0) { + choco install --yes "--package-parameters=/SSHServerFeature" openssh + Start-Service sshd + Set-Service -Name sshd -StartupType 'Automatic' + } else { + echo 'Skipping SSH Server' + } + + Write-Host 'Press any key to continue...' + [System.Console]::ReadKey($true) +}