From 5e82420a7473789084d36d81f52c53277c2c7adc Mon Sep 17 00:00:00 2001
From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com>
Date: Tue, 28 Nov 2023 02:25:03 +0100
Subject: [PATCH] [macOS] Rename build scripts (#8887)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Co-authored-by: Alexey Ayupov <“alexey.ayupov@akvelon.com”>
---
...gure-toolset.ps1 => Configure-Toolset.ps1} | 0
.../{toolset.ps1 => Install-Toolset.ps1} | 7 +-
.../build/{xcode.ps1 => Install-Xcode.ps1} | 5 +
...ulators.ps1 => Update-XcodeSimulators.ps1} | 7 +-
images/macos/scripts/build/apache.sh | 8 --
images/macos/scripts/build/bicep.sh | 9 --
images/macos/scripts/build/cleanup-brew.sh | 7 -
...o-updates.sh => configure-auto-updates.sh} | 7 +-
.../{autologin.sh => configure-autologin.sh} | 11 +-
.../macos/scripts/build/configure-hostname.sh | 8 +-
.../macos/scripts/build/configure-machine.sh | 4 +
...s.sh => configure-max-files-limitation.sh} | 5 +-
... configure-network-interface-detection.sh} | 14 +-
.../{ntpconf.sh => configure-ntpconf.sh} | 4 +
...imagedata.sh => configure-preimagedata.sh} | 4 +
...nsaver-off.sh => configure-screensaver.sh} | 4 +
.../{shell-change.sh => configure-shell.sh} | 6 +-
images/macos/scripts/build/configure-ssh.sh | 4 +
.../{finalize-vm.sh => configure-system.sh} | 4 +
.../scripts/build/configure-tccdb-macos.sh | 6 +-
..._windows_check.sh => configure-windows.sh} | 4 +
...-sims.rb => configure-xcode-simulators.rb} | 59 ++++----
...ymlinks.sh => configure-xcode-symlinks.sh} | 13 +-
...{xcode-postbuild.sh => configure-xcode.sh} | 4 +
...hive-cache.sh => install-actions-cache.sh} | 6 +-
...oid-toolsets.sh => install-android-sdk.sh} | 5 +
images/macos/scripts/build/install-apache.sh | 12 ++
...{audiodevice.sh => install-audiodevice.sh} | 5 +
.../build/{aws.sh => install-aws-tools.sh} | 5 +
.../build/{azcopy.sh => install-azcopy.sh} | 5 +
images/macos/scripts/build/install-bicep.sh | 13 ++
.../build/{chrome.sh => install-chrome.sh} | 5 +
.../{cocoapods.sh => install-cocoapods.sh} | 4 +
...eql-bundle.sh => install-codeql-bundle.sh} | 5 +
...commonutils.sh => install-common-utils.sh} | 5 +
.../build/{dotnet.sh => install-dotnet.sh} | 10 +-
.../build/{edge.sh => install-edge.sh} | 5 +
.../build/{firefox.sh => install-firefox.sh} | 5 +
.../scripts/build/{gcc.sh => install-gcc.sh} | 5 +
.../scripts/build/{git.sh => install-git.sh} | 5 +
.../build/{golang.sh => install-golang.sh} | 7 +-
.../build/{haskell.sh => install-haskell.sh} | 4 +
.../{homebrew.sh => install-homebrew.sh} | 6 +-
images/macos/scripts/build/install-llvm.sh | 13 ++
.../{miniconda.sh => install-miniconda.sh} | 4 +
.../build/{mongodb.sh => install-mongodb.sh} | 5 +
.../build/{mono.sh => install-mono.sh} | 5 +-
images/macos/scripts/build/install-nginx.sh | 12 ++
.../build/{node.sh => install-node.sh} | 5 +
.../scripts/build/{nvm.sh => install-nvm.sh} | 9 +-
.../build/{openjdk.sh => install-openjdk.sh} | 5 +
.../build/{openssl.sh => install-openssl.sh} | 5 +
.../scripts/build/{php.sh => install-php.sh} | 5 +
...x-packages.sh => install-pipx-packages.sh} | 5 +
.../{postgresql.sh => install-postgresql.sh} | 5 +
.../{powershell.sh => install-powershell.sh} | 5 +
.../build/{pypy.sh => install-pypy.sh} | 4 +-
.../build/{python.sh => install-python.sh} | 5 +
images/macos/scripts/build/install-rosetta.sh | 8 ++
.../build/{ruby.sh => install-ruby.sh} | 6 +
.../build/{rubygem.sh => install-rubygems.sh} | 5 +
.../build/{rust.sh => install-rust.sh} | 5 +
.../build/{safari.sh => install-safari.sh} | 6 +-
.../{swiftlint.sh => install-swiftlint.sh} | 5 +
.../build/{vcpkg.sh => install-vcpkg.sh} | 5 +
.../{vsmac.sh => install-visualstudio.sh} | 5 +
.../build/{xamarin.sh => install-xamarin.sh} | 5 +
.../{xcode-clt.sh => install-xcode-clt.sh} | 7 +-
...de-sims.sh => install-xcode-simulators.sh} | 4 +
images/macos/scripts/build/llvm.sh | 8 --
images/macos/scripts/build/nginx.sh | 8 --
images/macos/scripts/build/reboot.sh | 3 -
images/macos/scripts/build/rosetta.sh | 4 -
...erator.ps1 => Generate-SoftwareReport.ps1} | 2 +-
.../docs-gen/SoftwareReport.Android.psm1 | 2 +-
.../SoftwareReport.Helpers.psm1 | 0
images/macos/scripts/helpers/invoke-tests.sh | 2 +-
images/macos/scripts/tests/Android.Tests.ps1 | 2 +-
images/macos/scripts/tests/Common.Tests.ps1 | 2 +-
.../Tests.Helpers.psm1 => tests/Helpers.psm1} | 4 +-
images/macos/scripts/tests/Java.Tests.ps1 | 2 +-
images/macos/scripts/tests/LLVM.Tests.ps1 | 4 +-
images/macos/scripts/tests/Linters.Tests.ps1 | 2 +-
images/macos/scripts/tests/Node.Tests.ps1 | 2 +-
.../macos/scripts/tests/Powershell.Tests.ps1 | 4 +-
images/macos/scripts/tests/Python.Tests.ps1 | 2 +-
.../macos/scripts/tests/Ruby.arm64.Tests.ps1 | 2 +-
images/macos/scripts/tests/Ruby.x64.Tests.ps1 | 2 +-
images/macos/scripts/tests/RunAll-Tests.ps1 | 4 +-
.../macos/scripts/tests/Toolcache.Tests.ps1 | 2 +-
images/macos/scripts/tests/Toolset.Tests.ps1 | 4 +-
images/macos/scripts/tests/Xamarin.Tests.ps1 | 2 +-
images/macos/scripts/tests/Xcode.Tests.ps1 | 4 +-
images/macos/templates/macOS-11.json | 130 +++++++++---------
images/macos/templates/macOS-12.anka.pkr.hcl | 124 ++++++++---------
images/macos/templates/macOS-12.json | 130 +++++++++---------
images/macos/templates/macOS-13.anka.pkr.hcl | 100 +++++++-------
.../templates/macOS-13.arm64.anka.pkr.hcl | 78 +++++------
images/macos/templates/macOS-14.anka.pkr.hcl | 96 ++++++-------
.../templates/macOS-14.arm64.anka.pkr.hcl | 74 +++++-----
100 files changed, 764 insertions(+), 515 deletions(-)
rename images/macos/scripts/build/{configure-toolset.ps1 => Configure-Toolset.ps1} (100%)
rename images/macos/scripts/build/{toolset.ps1 => Install-Toolset.ps1} (94%)
rename images/macos/scripts/build/{xcode.ps1 => Install-Xcode.ps1} (91%)
rename images/macos/scripts/build/{fix-xcode-simulators.ps1 => Update-XcodeSimulators.ps1} (89%)
delete mode 100644 images/macos/scripts/build/apache.sh
delete mode 100644 images/macos/scripts/build/bicep.sh
delete mode 100644 images/macos/scripts/build/cleanup-brew.sh
rename images/macos/scripts/build/{disable-auto-updates.sh => configure-auto-updates.sh} (56%)
rename images/macos/scripts/build/{autologin.sh => configure-autologin.sh} (75%)
rename images/macos/scripts/build/{max-files.sh => configure-max-files-limitation.sh} (82%)
rename images/macos/scripts/build/{add-network-interface-detection.sh => configure-network-interface-detection.sh} (79%)
rename images/macos/scripts/build/{ntpconf.sh => configure-ntpconf.sh} (58%)
rename images/macos/scripts/build/{preimagedata.sh => configure-preimagedata.sh} (85%)
rename images/macos/scripts/build/{screensaver-off.sh => configure-screensaver.sh} (87%)
rename images/macos/scripts/build/{shell-change.sh => configure-shell.sh} (59%)
rename images/macos/scripts/build/{finalize-vm.sh => configure-system.sh} (83%)
rename images/macos/scripts/build/{open_windows_check.sh => configure-windows.sh} (81%)
rename images/macos/scripts/build/{delete-duplicate-sims.rb => configure-xcode-simulators.rb} (79%)
rename images/macos/scripts/build/{build-xcode-symlinks.sh => configure-xcode-symlinks.sh} (64%)
rename images/macos/scripts/build/{xcode-postbuild.sh => configure-xcode.sh} (83%)
rename images/macos/scripts/build/{action-archive-cache.sh => install-actions-cache.sh} (87%)
rename images/macos/scripts/build/{android-toolsets.sh => install-android-sdk.sh} (95%)
create mode 100644 images/macos/scripts/build/install-apache.sh
rename images/macos/scripts/build/{audiodevice.sh => install-audiodevice.sh} (72%)
rename images/macos/scripts/build/{aws.sh => install-aws-tools.sh} (59%)
rename images/macos/scripts/build/{azcopy.sh => install-azcopy.sh} (72%)
create mode 100644 images/macos/scripts/build/install-bicep.sh
rename images/macos/scripts/build/{chrome.sh => install-chrome.sh} (91%)
rename images/macos/scripts/build/{cocoapods.sh => install-cocoapods.sh} (52%)
rename images/macos/scripts/build/{codeql-bundle.sh => install-codeql-bundle.sh} (85%)
rename images/macos/scripts/build/{commonutils.sh => install-common-utils.sh} (93%)
rename images/macos/scripts/build/{dotnet.sh => install-dotnet.sh} (91%)
rename images/macos/scripts/build/{edge.sh => install-edge.sh} (91%)
rename images/macos/scripts/build/{firefox.sh => install-firefox.sh} (61%)
rename images/macos/scripts/build/{gcc.sh => install-gcc.sh} (65%)
rename images/macos/scripts/build/{git.sh => install-git.sh} (82%)
rename images/macos/scripts/build/{golang.sh => install-golang.sh} (60%)
rename images/macos/scripts/build/{haskell.sh => install-haskell.sh} (81%)
rename images/macos/scripts/build/{homebrew.sh => install-homebrew.sh} (82%)
create mode 100644 images/macos/scripts/build/install-llvm.sh
rename images/macos/scripts/build/{miniconda.sh => install-miniconda.sh} (72%)
rename images/macos/scripts/build/{mongodb.sh => install-mongodb.sh} (72%)
rename images/macos/scripts/build/{mono.sh => install-mono.sh} (97%)
create mode 100644 images/macos/scripts/build/install-nginx.sh
rename images/macos/scripts/build/{node.sh => install-node.sh} (74%)
rename images/macos/scripts/build/{nvm.sh => install-nvm.sh} (90%)
rename images/macos/scripts/build/{openjdk.sh => install-openjdk.sh} (94%)
rename images/macos/scripts/build/{openssl.sh => install-openssl.sh} (72%)
rename images/macos/scripts/build/{php.sh => install-php.sh} (53%)
rename images/macos/scripts/build/{pipx-packages.sh => install-pipx-packages.sh} (74%)
rename images/macos/scripts/build/{postgresql.sh => install-postgresql.sh} (80%)
rename images/macos/scripts/build/{powershell.sh => install-powershell.sh} (90%)
rename images/macos/scripts/build/{pypy.sh => install-pypy.sh} (98%)
rename images/macos/scripts/build/{python.sh => install-python.sh} (86%)
create mode 100644 images/macos/scripts/build/install-rosetta.sh
rename images/macos/scripts/build/{ruby.sh => install-ruby.sh} (91%)
rename images/macos/scripts/build/{rubygem.sh => install-rubygems.sh} (68%)
rename images/macos/scripts/build/{rust.sh => install-rust.sh} (72%)
rename images/macos/scripts/build/{safari.sh => install-safari.sh} (73%)
rename images/macos/scripts/build/{swiftlint.sh => install-swiftlint.sh} (73%)
rename images/macos/scripts/build/{vcpkg.sh => install-vcpkg.sh} (75%)
rename images/macos/scripts/build/{vsmac.sh => install-visualstudio.sh} (88%)
rename images/macos/scripts/build/{xamarin.sh => install-xamarin.sh} (93%)
rename images/macos/scripts/build/{xcode-clt.sh => install-xcode-clt.sh} (86%)
rename images/macos/scripts/build/{xcode-sims.sh => install-xcode-simulators.sh} (64%)
delete mode 100644 images/macos/scripts/build/llvm.sh
delete mode 100644 images/macos/scripts/build/nginx.sh
delete mode 100644 images/macos/scripts/build/reboot.sh
delete mode 100644 images/macos/scripts/build/rosetta.sh
rename images/macos/scripts/docs-gen/{SoftwareReport.Generator.ps1 => Generate-SoftwareReport.ps1} (99%)
rename images/macos/scripts/{helpers => docs-gen}/SoftwareReport.Helpers.psm1 (100%)
rename images/macos/scripts/{helpers/Tests.Helpers.psm1 => tests/Helpers.psm1} (98%)
diff --git a/images/macos/scripts/build/configure-toolset.ps1 b/images/macos/scripts/build/Configure-Toolset.ps1
similarity index 100%
rename from images/macos/scripts/build/configure-toolset.ps1
rename to images/macos/scripts/build/Configure-Toolset.ps1
diff --git a/images/macos/scripts/build/toolset.ps1 b/images/macos/scripts/build/Install-Toolset.ps1
similarity index 94%
rename from images/macos/scripts/build/toolset.ps1
rename to images/macos/scripts/build/Install-Toolset.ps1
index 5648623b..e89da38e 100644
--- a/images/macos/scripts/build/toolset.ps1
+++ b/images/macos/scripts/build/Install-Toolset.ps1
@@ -1,9 +1,10 @@
################################################################################
-## File: toolset.ps1
+## File: Install-Toolset.ps1
## Team: CI-Build
## Desc: Install toolset
################################################################################
-Import-Module "~/image-generation/helpers/Tests.Helpers.psm1"
+
+Import-Module "~/image-generation/tests/Helpers.psm1"
Import-Module "~/image-generation/helpers/Common.Helpers.psm1"
Function Install-Asset {
@@ -55,4 +56,4 @@ foreach ($tool in $tools) {
}
}
-Invoke-PesterTests "Toolcache"
\ No newline at end of file
+Invoke-PesterTests "Toolcache"
diff --git a/images/macos/scripts/build/xcode.ps1 b/images/macos/scripts/build/Install-Xcode.ps1
similarity index 91%
rename from images/macos/scripts/build/xcode.ps1
rename to images/macos/scripts/build/Install-Xcode.ps1
index 9f6c07c7..eec15f51 100644
--- a/images/macos/scripts/build/xcode.ps1
+++ b/images/macos/scripts/build/Install-Xcode.ps1
@@ -1,3 +1,8 @@
+################################################################################
+## File: Install-Xcode.ps1
+## Desc: Install Xcode
+################################################################################
+
$ErrorActionPreference = "Stop"
Import-Module "$env:HOME/image-generation/helpers/Common.Helpers.psm1"
diff --git a/images/macos/scripts/build/fix-xcode-simulators.ps1 b/images/macos/scripts/build/Update-XcodeSimulators.ps1
similarity index 89%
rename from images/macos/scripts/build/fix-xcode-simulators.ps1
rename to images/macos/scripts/build/Update-XcodeSimulators.ps1
index 98b1061e..7c083d8e 100644
--- a/images/macos/scripts/build/fix-xcode-simulators.ps1
+++ b/images/macos/scripts/build/Update-XcodeSimulators.ps1
@@ -1,3 +1,8 @@
+################################################################################
+## File: Update-XcodeSimulators.ps1
+## Desc: Check available Xcode simulators and create missing ones
+################################################################################
+
$ErrorActionPreference = "Stop"
Import-Module "$env:HOME/image-generation/helpers/Xcode.Helpers.psm1" -DisableNameChecking
@@ -48,4 +53,4 @@ Get-XcodeInfoList | Out-Null
Write-Host "Validating and fixing Xcode simulators..."
Get-BrokenXcodeSimulatorsList | ForEach-Object {
Ensure-SimulatorInstalled -RuntimeId $_.RuntimeId -DeviceId $_.DeviceId -SimulatorName $_.SimulatorName -XcodeVersion $_.XcodeVersion
-}
\ No newline at end of file
+}
diff --git a/images/macos/scripts/build/apache.sh b/images/macos/scripts/build/apache.sh
deleted file mode 100644
index 8fa375f9..00000000
--- a/images/macos/scripts/build/apache.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash -e -o pipefail
-
-source ~/utils/utils.sh
-
-brew_smart_install httpd
-sudo sed -Ei '' 's/Listen .*/Listen 80/' $(brew --prefix)/etc/httpd/httpd.conf
-
-invoke_tests "WebServers" "Apache"
diff --git a/images/macos/scripts/build/bicep.sh b/images/macos/scripts/build/bicep.sh
deleted file mode 100644
index 87ca8ee9..00000000
--- a/images/macos/scripts/build/bicep.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash -e -o pipefail
-
-source ~/utils/utils.sh
-
-echo Installing bicep cli...
-brew tap azure/bicep
-brew_smart_install bicep
-
-invoke_tests "Common" "Bicep"
diff --git a/images/macos/scripts/build/cleanup-brew.sh b/images/macos/scripts/build/cleanup-brew.sh
deleted file mode 100644
index 99d596b1..00000000
--- a/images/macos/scripts/build/cleanup-brew.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash -e -o pipefail
-###########################################################################
-# The script removes local Homebrew cache
-#
-###########################################################################
-
-rm -rf "$(brew --cache)"
diff --git a/images/macos/scripts/build/disable-auto-updates.sh b/images/macos/scripts/build/configure-auto-updates.sh
similarity index 56%
rename from images/macos/scripts/build/disable-auto-updates.sh
rename to images/macos/scripts/build/configure-auto-updates.sh
index 050f7d9a..c11525b5 100644
--- a/images/macos/scripts/build/disable-auto-updates.sh
+++ b/images/macos/scripts/build/configure-auto-updates.sh
@@ -1,8 +1,11 @@
#!/bin/bash -e -o pipefail
+################################################################################
+## File: configure-auto-updates.sh
+## Desc: Disabling automatic updates
+################################################################################
-# Disabling automatic updates
sudo softwareupdate --schedule off
defaults write com.apple.SoftwareUpdate AutomaticDownload -int 0
defaults write com.apple.SoftwareUpdate CriticalUpdateInstall -int 0
defaults write com.apple.commerce AutoUpdate -bool false
-defaults write com.apple.SoftwareUpdate AutomaticCheckEnabled -bool false
\ No newline at end of file
+defaults write com.apple.SoftwareUpdate AutomaticCheckEnabled -bool false
diff --git a/images/macos/scripts/build/autologin.sh b/images/macos/scripts/build/configure-autologin.sh
similarity index 75%
rename from images/macos/scripts/build/autologin.sh
rename to images/macos/scripts/build/configure-autologin.sh
index 2e962490..f281237e 100644
--- a/images/macos/scripts/build/autologin.sh
+++ b/images/macos/scripts/build/configure-autologin.sh
@@ -1,7 +1,10 @@
#!/bin/bash -e -o pipefail
-
-# This script was taken from https://github.com/timsutton/osx-vm-templates/blob/master/scripts/autologin.sh
-# Distributed by MIT license, license can be found at the bottom of this script
+################################################################################
+## File: configure-autologin.sh
+## Desc: add a Daemon to re-detect the attached network interfaces after vm is booted.
+## Maintainer: @timsutton
+## script was taken from https://github.com/timsutton/osx-vm-templates/blob/master/scripts/autologin.sh
+################################################################################
echo "Enabling automatic GUI login for the '$USERNAME' user.."
@@ -15,4 +18,4 @@ Copyright (c) 2013-2017 Timothy Sutton
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-'
\ No newline at end of file
+'
diff --git a/images/macos/scripts/build/configure-hostname.sh b/images/macos/scripts/build/configure-hostname.sh
index fef3bb2e..40c9f51e 100644
--- a/images/macos/scripts/build/configure-hostname.sh
+++ b/images/macos/scripts/build/configure-hostname.sh
@@ -1,6 +1,10 @@
#!/bin/bash -e -o pipefail
+################################################################################
+## File: configure-hostname.sh
+## Desc: Change the hostname at startup to prevent duplicates
+## Hostname and Computername should contain .local in name to avoid name resolution issues
+################################################################################
-# Add script for changing hostname to run on startup to prevent duplicate hostnames across the environment. Hostname and Computername should contain .local in name to avoid name resolution issues
tee -a /usr/local/bin/change_hostname.sh > /dev/null <<\EOF
#!/bin/bash -e -o pipefail
@@ -25,4 +29,4 @@ sudo tee -a /Library/LaunchDaemons/change_hostname.plist > /dev/null <<\EOF
-EOF
\ No newline at end of file
+EOF
diff --git a/images/macos/scripts/build/configure-machine.sh b/images/macos/scripts/build/configure-machine.sh
index 32beba10..e8eda5c4 100644
--- a/images/macos/scripts/build/configure-machine.sh
+++ b/images/macos/scripts/build/configure-machine.sh
@@ -1,4 +1,8 @@
#!/bin/bash -e -o pipefail
+################################################################################
+## File: configure-machine.sh
+## Desc: Configure guest OS settings
+################################################################################
source ~/utils/utils.sh
diff --git a/images/macos/scripts/build/max-files.sh b/images/macos/scripts/build/configure-max-files-limitation.sh
similarity index 82%
rename from images/macos/scripts/build/max-files.sh
rename to images/macos/scripts/build/configure-max-files-limitation.sh
index a18d7033..de9d13f0 100644
--- a/images/macos/scripts/build/max-files.sh
+++ b/images/macos/scripts/build/configure-max-files-limitation.sh
@@ -1,4 +1,8 @@
#!/bin/bash -e -o pipefail
+################################################################################
+## File: configure-max-files-limitation.sh
+## Desc: Configure max files limitation
+################################################################################
Launch_Daemons="/Library/LaunchDaemons"
@@ -39,4 +43,3 @@ chmod 0644 "${Launch_Daemons}/limit.maxfiles.plist"
echo "Done, limit.maxfiles has been updated"
-
diff --git a/images/macos/scripts/build/add-network-interface-detection.sh b/images/macos/scripts/build/configure-network-interface-detection.sh
similarity index 79%
rename from images/macos/scripts/build/add-network-interface-detection.sh
rename to images/macos/scripts/build/configure-network-interface-detection.sh
index ca9192bf..c60cd636 100644
--- a/images/macos/scripts/build/add-network-interface-detection.sh
+++ b/images/macos/scripts/build/configure-network-interface-detection.sh
@@ -1,11 +1,11 @@
#!/bin/bash -e -o pipefail
+################################################################################
+## File: configure-network-interface-detection.sh
+## Desc: add a Daemon to re-detect the attached network interfaces after vm is booted.
+## Maintainer: @timsutton
+## script was taken from https://github.com/timsutton/osx-vm-templates/blob/master/scripts/add-network-interface-detection.sh
+################################################################################
-# This script was taken from https://github.com/timsutton/osx-vm-templates/blob/master/scripts/add-network-interface-detection.sh
-# Distributed by MIT license, license can be found at the bottom of this script
-
-# This script adds a Mac OS Launch Daemon, which runs every time the
-# machine is booted. The daemon will re-detect the attached network
-# interfaces. If this is not done, network devices may not work.
PLIST=/Library/LaunchDaemons/sonoma.detectnewhardware.plist
cat < "${PLIST}"
@@ -37,4 +37,4 @@ Copyright (c) 2013-2017 Timothy Sutton
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-'
\ No newline at end of file
+'
diff --git a/images/macos/scripts/build/ntpconf.sh b/images/macos/scripts/build/configure-ntpconf.sh
similarity index 58%
rename from images/macos/scripts/build/ntpconf.sh
rename to images/macos/scripts/build/configure-ntpconf.sh
index b4f68128..cdb6f3d1 100644
--- a/images/macos/scripts/build/ntpconf.sh
+++ b/images/macos/scripts/build/configure-ntpconf.sh
@@ -1,4 +1,8 @@
#!/bin/bash -e -o pipefail
+################################################################################
+## File: configure-ntpconf.sh
+## Desc: Configure NTP servers and set the timezone to UTC
+################################################################################
echo Additional NTP servers adding into /etc/ntp.conf file...
cat > /etc/ntp.conf << EOF
diff --git a/images/macos/scripts/build/preimagedata.sh b/images/macos/scripts/build/configure-preimagedata.sh
similarity index 85%
rename from images/macos/scripts/build/preimagedata.sh
rename to images/macos/scripts/build/configure-preimagedata.sh
index 4f8e284b..ddd5d8f5 100644
--- a/images/macos/scripts/build/preimagedata.sh
+++ b/images/macos/scripts/build/configure-preimagedata.sh
@@ -1,4 +1,8 @@
#!/bin/bash -e -o pipefail
+################################################################################
+## File: configure-preimagedata.sh
+## Desc: Configure data used in the image
+################################################################################
source ~/utils/utils.sh
diff --git a/images/macos/scripts/build/screensaver-off.sh b/images/macos/scripts/build/configure-screensaver.sh
similarity index 87%
rename from images/macos/scripts/build/screensaver-off.sh
rename to images/macos/scripts/build/configure-screensaver.sh
index 6844792e..6b4900cc 100644
--- a/images/macos/scripts/build/screensaver-off.sh
+++ b/images/macos/scripts/build/configure-screensaver.sh
@@ -1,4 +1,8 @@
#!/bin/bash -e -o pipefail
+################################################################################
+## File: configure-screensaver.sh
+## Desc: Configure screensaver
+################################################################################
# set screensaver idleTime to 0, to prevent turning screensaver on
macUUID=`ioreg -rd1 -c IOPlatformExpertDevice | grep -i "UUID" | cut -c27-62`
diff --git a/images/macos/scripts/build/shell-change.sh b/images/macos/scripts/build/configure-shell.sh
similarity index 59%
rename from images/macos/scripts/build/shell-change.sh
rename to images/macos/scripts/build/configure-shell.sh
index 8632a68e..ec12cbeb 100644
--- a/images/macos/scripts/build/shell-change.sh
+++ b/images/macos/scripts/build/configure-shell.sh
@@ -1,4 +1,8 @@
#!/bin/bash -e -o pipefail
+################################################################################
+## File: configure-shell.sh
+## Desc: Configure shell to use bash
+################################################################################
source ~/utils/utils.sh
arch=$(get_arch)
@@ -11,4 +15,4 @@ sudo chsh -s /bin/bash root
if [[ $arch == "arm64" ]]; then
echo "Adding Homebrew environment to bash"
/opt/homebrew/bin/brew shellenv >> ~/.bashrc
-fi
\ No newline at end of file
+fi
diff --git a/images/macos/scripts/build/configure-ssh.sh b/images/macos/scripts/build/configure-ssh.sh
index 0e448d85..aea34c74 100644
--- a/images/macos/scripts/build/configure-ssh.sh
+++ b/images/macos/scripts/build/configure-ssh.sh
@@ -1,4 +1,8 @@
#!/bin/bash -e -o pipefail
+################################################################################
+## File: configure-ssh.sh
+## Desc: Configure ssh
+################################################################################
[[ ! -d ~/.ssh ]] && mkdir ~/.ssh 2>/dev/null
chmod 777 ~/.ssh
diff --git a/images/macos/scripts/build/finalize-vm.sh b/images/macos/scripts/build/configure-system.sh
similarity index 83%
rename from images/macos/scripts/build/finalize-vm.sh
rename to images/macos/scripts/build/configure-system.sh
index a49ca919..32d64367 100644
--- a/images/macos/scripts/build/finalize-vm.sh
+++ b/images/macos/scripts/build/configure-system.sh
@@ -1,4 +1,8 @@
#!/bin/bash -e -o pipefail
+################################################################################
+## File: configure-system.sh
+## Desc: Post deployment system configuration actions
+################################################################################
source ~/utils/utils.sh
diff --git a/images/macos/scripts/build/configure-tccdb-macos.sh b/images/macos/scripts/build/configure-tccdb-macos.sh
index 1d863b42..dd2c9bb2 100644
--- a/images/macos/scripts/build/configure-tccdb-macos.sh
+++ b/images/macos/scripts/build/configure-tccdb-macos.sh
@@ -1,6 +1,8 @@
#!/bin/bash -e -o pipefail
-
-# This script adds permissions, which are required for some installed tools to work properly, to the TCC.db
+################################################################################
+## File: configure-tccdb-macos.sh
+## Desc: Configure permissions to the TCC.db
+################################################################################
source ~/utils/utils.sh
diff --git a/images/macos/scripts/build/open_windows_check.sh b/images/macos/scripts/build/configure-windows.sh
similarity index 81%
rename from images/macos/scripts/build/open_windows_check.sh
rename to images/macos/scripts/build/configure-windows.sh
index dab538ed..02da5fad 100644
--- a/images/macos/scripts/build/open_windows_check.sh
+++ b/images/macos/scripts/build/configure-windows.sh
@@ -1,4 +1,8 @@
#!/bin/bash -e -o pipefail
+################################################################################
+## File: configure-windows.sh
+## Desc: Close open windows
+################################################################################
source ~/utils/utils.sh
diff --git a/images/macos/scripts/build/delete-duplicate-sims.rb b/images/macos/scripts/build/configure-xcode-simulators.rb
similarity index 79%
rename from images/macos/scripts/build/delete-duplicate-sims.rb
rename to images/macos/scripts/build/configure-xcode-simulators.rb
index d7ee50a1..a585acc5 100644
--- a/images/macos/scripts/build/delete-duplicate-sims.rb
+++ b/images/macos/scripts/build/configure-xcode-simulators.rb
@@ -1,51 +1,40 @@
#!/usr/bin/env ruby
-
-# What is this for?
-# This script fixes an issue appeared for some Xcode users where it would show long identifiers
-# in the list of simulators instead of usual short names. This is caused by duplicate simulators
-# being sometimes created after switching between Xcode versions, with the same
-# device type + runtime pair occurring more than once in your list of available simulators.
-# Instead of showing the same simulator name twice, Xcode defaults to simulator identifiers.
-#
-# What it does?
-# The script queries Xcode's `simctl` utility for all simulators you have, finds duplicate type + runtime pairs,
-# and offers you to delete them. After that, Xcode should return to displaying the list of simulators normally.
-# When searching for duplicates, the script sorts simulators by their creation time to make sure it deletes
-# the copy that was created more recently.
-#
-# License
-# This script was taken from https://gist.github.com/vlas-voloshin/f9982128200345cd3fb7 and some modifications made
-# Distributed by MIT license, license can be found at the bottom of this script
+################################################################################
+## File: configure-xcode-simulators.rb
+## Desc: List all simulators, find duplicate type and delete them.
+## Maintainer: @vlas-voloshin
+## script was taken from https://gist.github.com/vlas-voloshin/f9982128200345cd3fb7
+################################################################################
class SimDevice
-
+
attr_accessor :runtime
attr_accessor :name
attr_accessor :identifier
attr_accessor :timestamp
-
+
def initialize(runtime, name, identifier, timestamp)
@runtime = runtime
@name = name
@identifier = identifier
@timestamp = timestamp
end
-
+
def to_s
return "#{@name} - #{@runtime} (#{@identifier}) [#{@timestamp}]"
end
-
+
def equivalent_to_device(device)
return @runtime == device.runtime && @name == device.name
end
-
+
end
-
+
# Executes a shell command and returns the result from stdout
def execute_simctl_command(command)
return %x[xcrun simctl #{command}]
end
-
+
# Retrieves the creation date/time of simulator with specified identifier
def simulator_creation_date(identifier)
directory = Dir.home() + "/Library/Developer/CoreSimulator/Devices/" + identifier
@@ -60,14 +49,14 @@ class SimDevice
return Time.now
end
end
-
+
# Deletes specified simulator
def delete_device(device)
execute_simctl_command("delete #{device.identifier}")
end
-
+
puts("Searching for simulators...")
-
+
# Retrieve the list of existing simulators
devices = []
runtime = ""
@@ -87,10 +76,10 @@ class SimDevice
devices.push(device)
end
end
-
+
# Sort the simulators by their creation timestamp, ascending
devices = devices.sort { |a, b| a.timestamp <=> b.timestamp }
-
+
duplicates = {}
# Enumerate all devices except for the last one
for i in 0..devices.count-2
@@ -106,12 +95,12 @@ class SimDevice
end
end
end
-
+
if duplicates.count == 0
puts("You don't have duplicate simulators!")
exit()
end
-
+
puts("Looks like you have #{duplicates.count} duplicate simulator#{duplicates.count > 1 ? "s" : ""}:")
duplicates.each_pair do |duplicate, original|
puts
@@ -120,14 +109,14 @@ class SimDevice
puts("#{original}")
end
puts
-
+
puts("Each duplicate was determined as the one created later than the 'original'.")
-
+
puts("Deleting...")
duplicates.each_key do |duplicate|
delete_device(duplicate)
end
-
+
puts("Done!")
=begin
@@ -152,4 +141,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
-=end
\ No newline at end of file
+=end
diff --git a/images/macos/scripts/build/build-xcode-symlinks.sh b/images/macos/scripts/build/configure-xcode-symlinks.sh
similarity index 64%
rename from images/macos/scripts/build/build-xcode-symlinks.sh
rename to images/macos/scripts/build/configure-xcode-symlinks.sh
index 60070938..1fbfe7ed 100644
--- a/images/macos/scripts/build/build-xcode-symlinks.sh
+++ b/images/macos/scripts/build/configure-xcode-symlinks.sh
@@ -1,13 +1,12 @@
#!/bin/bash -e -o pipefail
+################################################################################
+## File: configure-xcode-symlinks.sh
+## Desc: Link the existing Xcodes into the correct location for provisionator.
+## This is maintained for backwards compatibility only. Do not add new xcodes here.
+################################################################################
source ~/utils/utils.sh
-# Link the existing Xcodes into the correct location for provisionator.
-
-# These symlinks are necessary for Xamarin team to make sure that xamarin-provisionator can find them.
-
-# Old style provisionator directories. This is maintained for
-# backwards compatibility only. Do not add new xcodes here.
ln -sf /Applications/Xcode_8.app /Applications/Xcode8.app
ln -sf /Applications/Xcode_8.1.app /Applications/Xcode81.app
ln -sf /Applications/Xcode_9.app /Applications/Xcode9.app
@@ -17,4 +16,4 @@ ln -sf /Applications/Xcode_9.3.app /Applications/Xcode93.app
ln -sf /Applications/Xcode_9.3.app /Applications/Xcode_9.3_beta.app
ln -sf /Applications/Xcode_9.4.app /Applications/Xcode_9.4-beta.app
ln -sf /Applications/Xcode_9.4.app /Applications/Xcode_9.4_beta.app
-ln -sf /Applications/Xcode_9.4.app /Applications/Xcode_9.4_beta_2.app
\ No newline at end of file
+ln -sf /Applications/Xcode_9.4.app /Applications/Xcode_9.4_beta_2.app
diff --git a/images/macos/scripts/build/xcode-postbuild.sh b/images/macos/scripts/build/configure-xcode.sh
similarity index 83%
rename from images/macos/scripts/build/xcode-postbuild.sh
rename to images/macos/scripts/build/configure-xcode.sh
index 1a82545b..23b054f6 100644
--- a/images/macos/scripts/build/xcode-postbuild.sh
+++ b/images/macos/scripts/build/configure-xcode.sh
@@ -1,4 +1,8 @@
#!/bin/bash -e -o pipefail
+################################################################################
+## File: configure-xcode.sh
+## Desc: Configure Xcode after installation
+################################################################################
source ~/utils/utils.sh
XCODE_LIST=($(get_toolset_value '.xcode.versions | reverse | .[].link'))
diff --git a/images/macos/scripts/build/action-archive-cache.sh b/images/macos/scripts/build/install-actions-cache.sh
similarity index 87%
rename from images/macos/scripts/build/action-archive-cache.sh
rename to images/macos/scripts/build/install-actions-cache.sh
index 99ad6a0c..4e6a7336 100644
--- a/images/macos/scripts/build/action-archive-cache.sh
+++ b/images/macos/scripts/build/install-actions-cache.sh
@@ -1,9 +1,7 @@
#!/bin/bash -e -o pipefail
-
################################################################################
-## File: action-archive-cache.sh
-## Desc: Download latest release from https://github.com/actions/action-verions
-## and un-tar to $HOME/actionarchivecache
+## File: install-actions-cache.sh
+## Desc: Download latest release from https://github.com/actions/action-versions
## Maintainer: #actions-runtime and @TingluoHuang
################################################################################
diff --git a/images/macos/scripts/build/android-toolsets.sh b/images/macos/scripts/build/install-android-sdk.sh
similarity index 95%
rename from images/macos/scripts/build/android-toolsets.sh
rename to images/macos/scripts/build/install-android-sdk.sh
index 0589a5a4..c765ca64 100644
--- a/images/macos/scripts/build/android-toolsets.sh
+++ b/images/macos/scripts/build/install-android-sdk.sh
@@ -1,4 +1,9 @@
#!/bin/bash -e -o pipefail
+################################################################################
+## File: install-android-sdk.sh
+## Desc: Install Android SDK, NDK and tools
+################################################################################
+
source ~/utils/utils.sh
function filter_components_by_version {
diff --git a/images/macos/scripts/build/install-apache.sh b/images/macos/scripts/build/install-apache.sh
new file mode 100644
index 00000000..b87345ee
--- /dev/null
+++ b/images/macos/scripts/build/install-apache.sh
@@ -0,0 +1,12 @@
+#!/bin/bash -e -o pipefail
+################################################################################
+## File: install-apache.sh
+## Desc: Install Apache HTTP Server
+################################################################################
+
+source ~/utils/utils.sh
+
+brew_smart_install httpd
+sudo sed -Ei '' 's/Listen .*/Listen 80/' $(brew --prefix)/etc/httpd/httpd.conf
+
+invoke_tests "WebServers" "Apache"
diff --git a/images/macos/scripts/build/audiodevice.sh b/images/macos/scripts/build/install-audiodevice.sh
similarity index 72%
rename from images/macos/scripts/build/audiodevice.sh
rename to images/macos/scripts/build/install-audiodevice.sh
index d021dbb9..e600de55 100644
--- a/images/macos/scripts/build/audiodevice.sh
+++ b/images/macos/scripts/build/install-audiodevice.sh
@@ -1,4 +1,9 @@
#!/bin/bash -e -o pipefail
+################################################################################
+## File: install-audiodevice.sh
+## Desc: Install audio device
+################################################################################
+
source ~/utils/utils.sh
echo "install switchaudio-osx"
diff --git a/images/macos/scripts/build/aws.sh b/images/macos/scripts/build/install-aws-tools.sh
similarity index 59%
rename from images/macos/scripts/build/aws.sh
rename to images/macos/scripts/build/install-aws-tools.sh
index 8b93dae5..98a13dcc 100644
--- a/images/macos/scripts/build/aws.sh
+++ b/images/macos/scripts/build/install-aws-tools.sh
@@ -1,4 +1,9 @@
#!/bin/bash -e -o pipefail
+################################################################################
+## File: install-aws-tools.sh
+## Desc: Install the AWS CLI, Session Manager plugin for the AWS CLI, and AWS SAM CLI
+################################################################################
+
source ~/utils/utils.sh
echo Installing aws...
diff --git a/images/macos/scripts/build/azcopy.sh b/images/macos/scripts/build/install-azcopy.sh
similarity index 72%
rename from images/macos/scripts/build/azcopy.sh
rename to images/macos/scripts/build/install-azcopy.sh
index 5d540a7d..5cef5d41 100644
--- a/images/macos/scripts/build/azcopy.sh
+++ b/images/macos/scripts/build/install-azcopy.sh
@@ -1,4 +1,9 @@
#!/bin/bash -e -o pipefail
+################################################################################
+## File: install-azcopy.sh
+## Desc: Install AzCopy
+################################################################################
+
source ~/utils/utils.sh
arch=$(get_arch)
diff --git a/images/macos/scripts/build/install-bicep.sh b/images/macos/scripts/build/install-bicep.sh
new file mode 100644
index 00000000..fbae13e5
--- /dev/null
+++ b/images/macos/scripts/build/install-bicep.sh
@@ -0,0 +1,13 @@
+#!/bin/bash -e -o pipefail
+################################################################################
+## File: install-bicep.sh
+## Desc: Install bicep cli
+################################################################################
+
+source ~/utils/utils.sh
+
+echo Installing bicep cli...
+brew tap azure/bicep
+brew_smart_install bicep
+
+invoke_tests "Common" "Bicep"
diff --git a/images/macos/scripts/build/chrome.sh b/images/macos/scripts/build/install-chrome.sh
similarity index 91%
rename from images/macos/scripts/build/chrome.sh
rename to images/macos/scripts/build/install-chrome.sh
index 53cae0a2..c5fc50f9 100644
--- a/images/macos/scripts/build/chrome.sh
+++ b/images/macos/scripts/build/install-chrome.sh
@@ -1,4 +1,9 @@
#!/bin/bash -e -o pipefail
+################################################################################
+## File: install-chrome.sh
+## Desc: Install chrome and chrome for testing browsers
+################################################################################
+
source ~/utils/utils.sh
arch=$(get_arch)
diff --git a/images/macos/scripts/build/cocoapods.sh b/images/macos/scripts/build/install-cocoapods.sh
similarity index 52%
rename from images/macos/scripts/build/cocoapods.sh
rename to images/macos/scripts/build/install-cocoapods.sh
index 15d2a22a..de127744 100644
--- a/images/macos/scripts/build/cocoapods.sh
+++ b/images/macos/scripts/build/install-cocoapods.sh
@@ -1,4 +1,8 @@
#!/bin/bash -e -o pipefail
+################################################################################
+## File: install-cocoapods.sh
+## Desc: Install Cocoapods
+################################################################################
# Setup the Cocoapods
echo "Installing Cocoapods..."
diff --git a/images/macos/scripts/build/codeql-bundle.sh b/images/macos/scripts/build/install-codeql-bundle.sh
similarity index 85%
rename from images/macos/scripts/build/codeql-bundle.sh
rename to images/macos/scripts/build/install-codeql-bundle.sh
index 12044bdd..8f07f72f 100644
--- a/images/macos/scripts/build/codeql-bundle.sh
+++ b/images/macos/scripts/build/install-codeql-bundle.sh
@@ -1,4 +1,9 @@
#!/bin/bash -e -o pipefail
+################################################################################
+## File: install-codeql-bundle.sh
+## Desc: Install CodeQL bundle
+################################################################################
+
source ~/utils/utils.sh
# Retrieve the CLI version of the latest CodeQL bundle.
diff --git a/images/macos/scripts/build/commonutils.sh b/images/macos/scripts/build/install-common-utils.sh
similarity index 93%
rename from images/macos/scripts/build/commonutils.sh
rename to images/macos/scripts/build/install-common-utils.sh
index a22195aa..39a8accc 100644
--- a/images/macos/scripts/build/commonutils.sh
+++ b/images/macos/scripts/build/install-common-utils.sh
@@ -1,4 +1,9 @@
#!/bin/bash -e -o pipefail
+################################################################################
+## File: install-common-utils.sh
+## Desc: Install utils listed in toolset file
+################################################################################
+
source ~/utils/utils.sh
# Download and install YQ in cases when it is not available in the formulae as for macOS 11: https://formulae.brew.sh/formula/yq
diff --git a/images/macos/scripts/build/dotnet.sh b/images/macos/scripts/build/install-dotnet.sh
similarity index 91%
rename from images/macos/scripts/build/dotnet.sh
rename to images/macos/scripts/build/install-dotnet.sh
index f9fea237..4ff20b76 100644
--- a/images/macos/scripts/build/dotnet.sh
+++ b/images/macos/scripts/build/install-dotnet.sh
@@ -1,11 +1,9 @@
#!/bin/bash -e -o pipefail
+################################################################################
+## File: install-dotnet.sh
+## Desc: Install dotnet
+################################################################################
-###########################################################################
-# The main idea of this script is to automate dotnet installs
-# Based on:
-# https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-install-script
-#
-###########################################################################
source ~/utils/utils.sh
export DOTNET_CLI_TELEMETRY_OPTOUT=1
diff --git a/images/macos/scripts/build/edge.sh b/images/macos/scripts/build/install-edge.sh
similarity index 91%
rename from images/macos/scripts/build/edge.sh
rename to images/macos/scripts/build/install-edge.sh
index 122add09..d13f5b82 100644
--- a/images/macos/scripts/build/edge.sh
+++ b/images/macos/scripts/build/install-edge.sh
@@ -1,4 +1,9 @@
#!/bin/bash -e -o pipefail
+################################################################################
+## File: install-edge.sh
+## Desc: Install edge browser
+################################################################################
+
source ~/utils/utils.sh
echo "Installing Microsoft Edge..."
diff --git a/images/macos/scripts/build/firefox.sh b/images/macos/scripts/build/install-firefox.sh
similarity index 61%
rename from images/macos/scripts/build/firefox.sh
rename to images/macos/scripts/build/install-firefox.sh
index f2527c34..75c4f6cc 100644
--- a/images/macos/scripts/build/firefox.sh
+++ b/images/macos/scripts/build/install-firefox.sh
@@ -1,4 +1,9 @@
#!/bin/bash -e -o pipefail
+################################################################################
+## File: install-firefox.sh
+## Desc: Install firefox browser
+################################################################################
+
source ~/utils/utils.sh
echo "Installing Firefox..."
diff --git a/images/macos/scripts/build/gcc.sh b/images/macos/scripts/build/install-gcc.sh
similarity index 65%
rename from images/macos/scripts/build/gcc.sh
rename to images/macos/scripts/build/install-gcc.sh
index a7fa06fd..07155b60 100644
--- a/images/macos/scripts/build/gcc.sh
+++ b/images/macos/scripts/build/install-gcc.sh
@@ -1,4 +1,9 @@
#!/bin/bash -e -o pipefail
+################################################################################
+## File: install-gcc.sh
+## Desc: Install GCC
+################################################################################
+
source ~/utils/utils.sh
gccVersions=$(get_toolset_value '.gcc.versions | .[]')
diff --git a/images/macos/scripts/build/git.sh b/images/macos/scripts/build/install-git.sh
similarity index 82%
rename from images/macos/scripts/build/git.sh
rename to images/macos/scripts/build/install-git.sh
index 5721d627..fedc7d68 100644
--- a/images/macos/scripts/build/git.sh
+++ b/images/macos/scripts/build/install-git.sh
@@ -1,4 +1,9 @@
#!/bin/bash -e -o pipefail
+################################################################################
+## File: install-git.sh
+## Desc: Install Git and Git LFS
+################################################################################
+
source ~/utils/utils.sh
echo Installing Git...
diff --git a/images/macos/scripts/build/golang.sh b/images/macos/scripts/build/install-golang.sh
similarity index 60%
rename from images/macos/scripts/build/golang.sh
rename to images/macos/scripts/build/install-golang.sh
index 3c37431f..21d00d62 100644
--- a/images/macos/scripts/build/golang.sh
+++ b/images/macos/scripts/build/install-golang.sh
@@ -1,4 +1,9 @@
#!/bin/bash -e -o pipefail
+################################################################################
+## File: install-golang.sh
+## Desc: Install Go
+################################################################################
+
source ~/utils/utils.sh
DEFAULT_GO_VERSION=$(get_toolset_value '.go.default')
@@ -8,4 +13,4 @@ brew_smart_install "go@${DEFAULT_GO_VERSION}"
# Create symlinks to preserve backward compatibility. Symlinks are not created when non-latest go is being installed
ln -sf $(brew --prefix go@${DEFAULT_GO_VERSION})/bin/* /usr/local/bin/
-invoke_tests "Common" "Go"
\ No newline at end of file
+invoke_tests "Common" "Go"
diff --git a/images/macos/scripts/build/haskell.sh b/images/macos/scripts/build/install-haskell.sh
similarity index 81%
rename from images/macos/scripts/build/haskell.sh
rename to images/macos/scripts/build/install-haskell.sh
index 9856dc7d..982db587 100644
--- a/images/macos/scripts/build/haskell.sh
+++ b/images/macos/scripts/build/install-haskell.sh
@@ -1,4 +1,8 @@
#!/bin/bash -e -o pipefail
+################################################################################
+## File: install-haskell.sh
+## Desc: Install Haskell
+################################################################################
source ~/utils/utils.sh
diff --git a/images/macos/scripts/build/homebrew.sh b/images/macos/scripts/build/install-homebrew.sh
similarity index 82%
rename from images/macos/scripts/build/homebrew.sh
rename to images/macos/scripts/build/install-homebrew.sh
index dea00c93..b822c6ff 100644
--- a/images/macos/scripts/build/homebrew.sh
+++ b/images/macos/scripts/build/install-homebrew.sh
@@ -1,4 +1,8 @@
#!/bin/bash -e -o pipefail
+################################################################################
+## File: install-homebrew.sh
+## Desc: Install Homebrew
+################################################################################
source ~/utils/utils.sh
@@ -36,4 +40,4 @@ echo "Installing wget..."
brew_smart_install "wget"
# init brew bundle feature
-brew tap Homebrew/bundle
\ No newline at end of file
+brew tap Homebrew/bundle
diff --git a/images/macos/scripts/build/install-llvm.sh b/images/macos/scripts/build/install-llvm.sh
new file mode 100644
index 00000000..3ba7bffa
--- /dev/null
+++ b/images/macos/scripts/build/install-llvm.sh
@@ -0,0 +1,13 @@
+#!/bin/bash -e -o pipefail
+################################################################################
+## File: install-llvm.sh
+## Desc: Install LLVM
+################################################################################
+
+source ~/utils/utils.sh
+
+llvmVersion=$(get_toolset_value '.llvm.version')
+
+brew_smart_install "llvm@${llvmVersion}"
+
+invoke_tests "LLVM"
diff --git a/images/macos/scripts/build/miniconda.sh b/images/macos/scripts/build/install-miniconda.sh
similarity index 72%
rename from images/macos/scripts/build/miniconda.sh
rename to images/macos/scripts/build/install-miniconda.sh
index 7a781b7c..a50008f3 100644
--- a/images/macos/scripts/build/miniconda.sh
+++ b/images/macos/scripts/build/install-miniconda.sh
@@ -1,4 +1,8 @@
#!/bin/bash -e -o pipefail
+################################################################################
+## File: install-miniconda.sh
+## Desc: Install Miniconda
+################################################################################
source ~/utils/utils.sh
diff --git a/images/macos/scripts/build/mongodb.sh b/images/macos/scripts/build/install-mongodb.sh
similarity index 72%
rename from images/macos/scripts/build/mongodb.sh
rename to images/macos/scripts/build/install-mongodb.sh
index 0b6b32a9..092d7153 100644
--- a/images/macos/scripts/build/mongodb.sh
+++ b/images/macos/scripts/build/install-mongodb.sh
@@ -1,4 +1,9 @@
#!/bin/bash -e -o pipefail
+################################################################################
+## File: install-mongodb.sh
+## Desc: Install MongoDB
+################################################################################
+
source ~/utils/utils.sh
# MongoDB object-value database
diff --git a/images/macos/scripts/build/mono.sh b/images/macos/scripts/build/install-mono.sh
similarity index 97%
rename from images/macos/scripts/build/mono.sh
rename to images/macos/scripts/build/install-mono.sh
index f4052a25..c4af70a3 100644
--- a/images/macos/scripts/build/mono.sh
+++ b/images/macos/scripts/build/install-mono.sh
@@ -1,8 +1,7 @@
#!/bin/bash -e -o pipefail
-
################################################################################
-## File: mono.sh
-## Desc: Installs Mono Framework
+## File: install-mono.sh
+## Desc: Install Mono Framework
################################################################################
# Source utility functions
diff --git a/images/macos/scripts/build/install-nginx.sh b/images/macos/scripts/build/install-nginx.sh
new file mode 100644
index 00000000..0816b7eb
--- /dev/null
+++ b/images/macos/scripts/build/install-nginx.sh
@@ -0,0 +1,12 @@
+#!/bin/bash -e -o pipefail
+################################################################################
+## File: install-nginx.sh
+## Desc: Install Nginx
+################################################################################
+
+source ~/utils/utils.sh
+
+brew_smart_install nginx
+sudo sed -Ei '' 's/listen.*/listen 80;/' $(brew --prefix)/etc/nginx/nginx.conf
+
+invoke_tests "WebServers" "Nginx"
diff --git a/images/macos/scripts/build/node.sh b/images/macos/scripts/build/install-node.sh
similarity index 74%
rename from images/macos/scripts/build/node.sh
rename to images/macos/scripts/build/install-node.sh
index c4e3d8b9..d4ed820e 100644
--- a/images/macos/scripts/build/node.sh
+++ b/images/macos/scripts/build/install-node.sh
@@ -1,4 +1,9 @@
#!/bin/bash -e -o pipefail
+################################################################################
+## File: install-node.sh
+## Desc: Install Node.js
+################################################################################
+
source ~/utils/utils.sh
defaultVersion=$(get_toolset_value '.node.default')
diff --git a/images/macos/scripts/build/nvm.sh b/images/macos/scripts/build/install-nvm.sh
similarity index 90%
rename from images/macos/scripts/build/nvm.sh
rename to images/macos/scripts/build/install-nvm.sh
index 7eaa2fcd..59cafdaa 100644
--- a/images/macos/scripts/build/nvm.sh
+++ b/images/macos/scripts/build/install-nvm.sh
@@ -1,8 +1,9 @@
#!/bin/bash -e -o pipefail
-###########################################################################
-# The script installs node version manager with node versions 10,12 and 14
-#
-###########################################################################
+################################################################################
+## File: install-nvm.sh
+## Desc: Install node version manager
+################################################################################
+
source ~/utils/utils.sh
[ -n "$API_PAT" ] && authString=(-H "Authorization: token ${API_PAT}")
diff --git a/images/macos/scripts/build/openjdk.sh b/images/macos/scripts/build/install-openjdk.sh
similarity index 94%
rename from images/macos/scripts/build/openjdk.sh
rename to images/macos/scripts/build/install-openjdk.sh
index 496abd07..b5787786 100644
--- a/images/macos/scripts/build/openjdk.sh
+++ b/images/macos/scripts/build/install-openjdk.sh
@@ -1,4 +1,9 @@
#!/bin/bash -e -o pipefail
+################################################################################
+## File: install-openjdk.sh
+## Desc: Install openjdk
+################################################################################
+
source ~/utils/utils.sh
createEnvironmentVariable() {
diff --git a/images/macos/scripts/build/openssl.sh b/images/macos/scripts/build/install-openssl.sh
similarity index 72%
rename from images/macos/scripts/build/openssl.sh
rename to images/macos/scripts/build/install-openssl.sh
index 80f02369..aa55b74f 100644
--- a/images/macos/scripts/build/openssl.sh
+++ b/images/macos/scripts/build/install-openssl.sh
@@ -1,4 +1,9 @@
#!/bin/bash -e -o pipefail
+################################################################################
+## File: install-openssl.sh
+## Desc: Install openssl
+################################################################################
+
source ~/utils/utils.sh
echo "Install openssl@1.1"
diff --git a/images/macos/scripts/build/php.sh b/images/macos/scripts/build/install-php.sh
similarity index 53%
rename from images/macos/scripts/build/php.sh
rename to images/macos/scripts/build/install-php.sh
index bc68692b..757f8f50 100644
--- a/images/macos/scripts/build/php.sh
+++ b/images/macos/scripts/build/install-php.sh
@@ -1,4 +1,9 @@
#!/bin/bash -e -o pipefail
+################################################################################
+## File: install-php.sh
+## Desc: Install PHP
+################################################################################
+
source ~/utils/utils.sh
echo Installing PHP
diff --git a/images/macos/scripts/build/pipx-packages.sh b/images/macos/scripts/build/install-pipx-packages.sh
similarity index 74%
rename from images/macos/scripts/build/pipx-packages.sh
rename to images/macos/scripts/build/install-pipx-packages.sh
index 38446d3c..19efeee7 100644
--- a/images/macos/scripts/build/pipx-packages.sh
+++ b/images/macos/scripts/build/install-pipx-packages.sh
@@ -1,4 +1,9 @@
#!/bin/bash -e -o pipefail
+################################################################################
+## File: install-pipx-packages.sh
+## Desc: Install Pipx Packages
+################################################################################
+
source ~/utils/utils.sh
export PATH="$PATH:/opt/pipx_bin"
diff --git a/images/macos/scripts/build/postgresql.sh b/images/macos/scripts/build/install-postgresql.sh
similarity index 80%
rename from images/macos/scripts/build/postgresql.sh
rename to images/macos/scripts/build/install-postgresql.sh
index 4d881486..5f62cc45 100644
--- a/images/macos/scripts/build/postgresql.sh
+++ b/images/macos/scripts/build/install-postgresql.sh
@@ -1,4 +1,9 @@
#!/bin/bash -e -o pipefail
+################################################################################
+## File: install-postgresql.sh
+## Desc: Install PostgreSQL
+################################################################################
+
source ~/utils/utils.sh
# Fetch PostgreSQL version to install from the toolset
diff --git a/images/macos/scripts/build/powershell.sh b/images/macos/scripts/build/install-powershell.sh
similarity index 90%
rename from images/macos/scripts/build/powershell.sh
rename to images/macos/scripts/build/install-powershell.sh
index 428345e5..33adb016 100644
--- a/images/macos/scripts/build/powershell.sh
+++ b/images/macos/scripts/build/install-powershell.sh
@@ -1,4 +1,9 @@
#!/bin/bash -e -o pipefail
+################################################################################
+## File: install-powershell.sh
+## Desc: Install PowerShell
+################################################################################
+
source ~/utils/utils.sh
echo Installing PowerShell...
diff --git a/images/macos/scripts/build/pypy.sh b/images/macos/scripts/build/install-pypy.sh
similarity index 98%
rename from images/macos/scripts/build/pypy.sh
rename to images/macos/scripts/build/install-pypy.sh
index 6e12ed9c..39464414 100644
--- a/images/macos/scripts/build/pypy.sh
+++ b/images/macos/scripts/build/install-pypy.sh
@@ -1,7 +1,7 @@
#!/bin/bash -e -o pipefail
################################################################################
-## File: pypy.sh
-## Desc: Installs PyPy
+## File: install-pypy.sh
+## Desc: Install PyPy
################################################################################
source ~/utils/utils.sh
diff --git a/images/macos/scripts/build/python.sh b/images/macos/scripts/build/install-python.sh
similarity index 86%
rename from images/macos/scripts/build/python.sh
rename to images/macos/scripts/build/install-python.sh
index be801340..dd55c820 100644
--- a/images/macos/scripts/build/python.sh
+++ b/images/macos/scripts/build/install-python.sh
@@ -1,4 +1,9 @@
#!/bin/bash -e -o pipefail
+################################################################################
+## File: install-python.sh
+## Desc: Install Python
+################################################################################
+
source ~/utils/utils.sh
echo "Installing Python Tooling"
diff --git a/images/macos/scripts/build/install-rosetta.sh b/images/macos/scripts/build/install-rosetta.sh
new file mode 100644
index 00000000..af3a438c
--- /dev/null
+++ b/images/macos/scripts/build/install-rosetta.sh
@@ -0,0 +1,8 @@
+#!/bin/bash -e -o pipefail
+################################################################################
+## File: install-rosetta.sh
+## Desc: Install Rosetta
+################################################################################
+
+echo 'Installing Rosetta'
+/usr/sbin/softwareupdate --install-rosetta --agree-to-license
diff --git a/images/macos/scripts/build/ruby.sh b/images/macos/scripts/build/install-ruby.sh
similarity index 91%
rename from images/macos/scripts/build/ruby.sh
rename to images/macos/scripts/build/install-ruby.sh
index b139b712..234312ee 100644
--- a/images/macos/scripts/build/ruby.sh
+++ b/images/macos/scripts/build/install-ruby.sh
@@ -1,4 +1,9 @@
#!/bin/bash -e -o pipefail
+################################################################################
+## File: install-ruby.sh
+## Desc: Install Ruby
+################################################################################
+
source ~/utils/utils.sh
arch=$(get_arch)
@@ -52,4 +57,5 @@ if ! is_Arm64; then
fi
done
fi
+
invoke_tests "Ruby.$arch"
diff --git a/images/macos/scripts/build/rubygem.sh b/images/macos/scripts/build/install-rubygems.sh
similarity index 68%
rename from images/macos/scripts/build/rubygem.sh
rename to images/macos/scripts/build/install-rubygems.sh
index 9b9b4cb6..15a20616 100644
--- a/images/macos/scripts/build/rubygem.sh
+++ b/images/macos/scripts/build/install-rubygems.sh
@@ -1,4 +1,9 @@
#!/bin/bash -e -o pipefail
+################################################################################
+## File: install-rubygems.sh
+## Desc: Install RubyGems
+################################################################################
+
source ~/utils/utils.sh
echo Updating RubyGems...
diff --git a/images/macos/scripts/build/rust.sh b/images/macos/scripts/build/install-rust.sh
similarity index 72%
rename from images/macos/scripts/build/rust.sh
rename to images/macos/scripts/build/install-rust.sh
index d2cc3b64..a1fa9840 100644
--- a/images/macos/scripts/build/rust.sh
+++ b/images/macos/scripts/build/install-rust.sh
@@ -1,4 +1,9 @@
#!/bin/bash -e -o pipefail
+################################################################################
+## File: install-rust.sh
+## Desc: Install Rust
+################################################################################
+
source ~/utils/utils.sh
echo Installing Rustup...
diff --git a/images/macos/scripts/build/safari.sh b/images/macos/scripts/build/install-safari.sh
similarity index 73%
rename from images/macos/scripts/build/safari.sh
rename to images/macos/scripts/build/install-safari.sh
index 8001c39e..bd4f54e7 100644
--- a/images/macos/scripts/build/safari.sh
+++ b/images/macos/scripts/build/install-safari.sh
@@ -1,4 +1,8 @@
#!/bin/bash -e -o pipefail
+################################################################################
+## File: install-safari.sh
+## Desc: Install Safari browser
+################################################################################
echo "Enabling safari driver..."
# https://developer.apple.com/documentation/webkit/testing_with_webdriver_in_safari
@@ -13,4 +17,4 @@ safari_plist="$HOME/Library/WebDriver/com.apple.Safari.plist"
/usr/libexec/PlistBuddy -c 'delete AllowRemoteAutomation' $safari_plist || true
/usr/libexec/PlistBuddy -c 'add AllowRemoteAutomation bool true' $safari_plist
-invoke_tests "Browsers" "Safari"
\ No newline at end of file
+invoke_tests "Browsers" "Safari"
diff --git a/images/macos/scripts/build/swiftlint.sh b/images/macos/scripts/build/install-swiftlint.sh
similarity index 73%
rename from images/macos/scripts/build/swiftlint.sh
rename to images/macos/scripts/build/install-swiftlint.sh
index d01b7308..5a3222e9 100644
--- a/images/macos/scripts/build/swiftlint.sh
+++ b/images/macos/scripts/build/install-swiftlint.sh
@@ -1,4 +1,9 @@
#!/bin/bash -e -o pipefail
+################################################################################
+## File: install-swiftlint.sh
+## Desc: Install SwiftLint
+################################################################################
+
source ~/utils/utils.sh
echo Installing Swiftlint...
diff --git a/images/macos/scripts/build/vcpkg.sh b/images/macos/scripts/build/install-vcpkg.sh
similarity index 75%
rename from images/macos/scripts/build/vcpkg.sh
rename to images/macos/scripts/build/install-vcpkg.sh
index 7ba16172..13acc0f1 100644
--- a/images/macos/scripts/build/vcpkg.sh
+++ b/images/macos/scripts/build/install-vcpkg.sh
@@ -1,4 +1,9 @@
#!/bin/bash -e -o pipefail
+################################################################################
+## File: install-vcpkg.sh
+## Desc: Install vcpkg
+################################################################################
+
source ~/utils/utils.sh
# Set env variable for vcpkg
diff --git a/images/macos/scripts/build/vsmac.sh b/images/macos/scripts/build/install-visualstudio.sh
similarity index 88%
rename from images/macos/scripts/build/vsmac.sh
rename to images/macos/scripts/build/install-visualstudio.sh
index 7e4cbc4e..34aa585c 100644
--- a/images/macos/scripts/build/vsmac.sh
+++ b/images/macos/scripts/build/install-visualstudio.sh
@@ -1,4 +1,9 @@
#!/bin/bash -e -o pipefail
+################################################################################
+## File: install-visualstudio.sh
+## Desc: Install Visual Studio
+################################################################################
+
source ~/utils/utils.sh
source ~/utils/xamarin-utils.sh
diff --git a/images/macos/scripts/build/xamarin.sh b/images/macos/scripts/build/install-xamarin.sh
similarity index 93%
rename from images/macos/scripts/build/xamarin.sh
rename to images/macos/scripts/build/install-xamarin.sh
index febdf5fd..3f9e7fcc 100644
--- a/images/macos/scripts/build/xamarin.sh
+++ b/images/macos/scripts/build/install-xamarin.sh
@@ -1,4 +1,9 @@
#!/bin/bash -e -o pipefail
+################################################################################
+## File: install-xamarin.sh
+## Desc: Install Xamarin
+################################################################################
+
source ~/utils/utils.sh
source ~/utils/xamarin-utils.sh
diff --git a/images/macos/scripts/build/xcode-clt.sh b/images/macos/scripts/build/install-xcode-clt.sh
similarity index 86%
rename from images/macos/scripts/build/xcode-clt.sh
rename to images/macos/scripts/build/install-xcode-clt.sh
index aecba8e8..13c17a5e 100644
--- a/images/macos/scripts/build/xcode-clt.sh
+++ b/images/macos/scripts/build/install-xcode-clt.sh
@@ -1,4 +1,9 @@
#!/bin/bash -e -o pipefail
+################################################################################
+## File: install-xcode-clt.sh
+## Desc: Install Xcode Command Line Tools
+################################################################################
+
source ~/utils/utils.sh
is_clt_installed() {
@@ -43,4 +48,4 @@ while ! is_clt_installed; do
((retries--))
echo "Wait $sleepInterval seconds before the next check for installed Command Line Tools"
sleep $sleepInterval
-done
\ No newline at end of file
+done
diff --git a/images/macos/scripts/build/xcode-sims.sh b/images/macos/scripts/build/install-xcode-simulators.sh
similarity index 64%
rename from images/macos/scripts/build/xcode-sims.sh
rename to images/macos/scripts/build/install-xcode-simulators.sh
index 8dff14a5..3ff94dac 100644
--- a/images/macos/scripts/build/xcode-sims.sh
+++ b/images/macos/scripts/build/install-xcode-simulators.sh
@@ -1,4 +1,8 @@
#!/bin/bash -e -o pipefail
+################################################################################
+## File: install-xcode-simulators.sh
+## Desc: Install Xcode simulators
+################################################################################
source ~/utils/utils.sh
diff --git a/images/macos/scripts/build/llvm.sh b/images/macos/scripts/build/llvm.sh
deleted file mode 100644
index ff1aa683..00000000
--- a/images/macos/scripts/build/llvm.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash -e -o pipefail
-source ~/utils/utils.sh
-
-llvmVersion=$(get_toolset_value '.llvm.version')
-
-brew_smart_install "llvm@${llvmVersion}"
-
-invoke_tests "LLVM"
\ No newline at end of file
diff --git a/images/macos/scripts/build/nginx.sh b/images/macos/scripts/build/nginx.sh
deleted file mode 100644
index f9c1e4c7..00000000
--- a/images/macos/scripts/build/nginx.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash -e -o pipefail
-
-source ~/utils/utils.sh
-
-brew_smart_install nginx
-sudo sed -Ei '' 's/listen.*/listen 80;/' $(brew --prefix)/etc/nginx/nginx.conf
-
-invoke_tests "WebServers" "Nginx"
diff --git a/images/macos/scripts/build/reboot.sh b/images/macos/scripts/build/reboot.sh
deleted file mode 100644
index e0a2dfb8..00000000
--- a/images/macos/scripts/build/reboot.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash -e -o pipefail
-
-shutdown -r now
\ No newline at end of file
diff --git a/images/macos/scripts/build/rosetta.sh b/images/macos/scripts/build/rosetta.sh
deleted file mode 100644
index ee0617fd..00000000
--- a/images/macos/scripts/build/rosetta.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash -e -o pipefail
-
-echo 'Installing Rosetta'
-/usr/sbin/softwareupdate --install-rosetta --agree-to-license
diff --git a/images/macos/scripts/docs-gen/SoftwareReport.Generator.ps1 b/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1
similarity index 99%
rename from images/macos/scripts/docs-gen/SoftwareReport.Generator.ps1
rename to images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1
index 3872575f..2419f45b 100644
--- a/images/macos/scripts/docs-gen/SoftwareReport.Generator.ps1
+++ b/images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1
@@ -17,7 +17,7 @@ Import-Module "$PSScriptRoot/SoftwareReport.Xamarin.psm1" -DisableNameChecking
Import-Module "$PSScriptRoot/SoftwareReport.Toolcache.psm1" -DisableNameChecking
Import-Module "$PSScriptRoot/SoftwareReport.Browsers.psm1" -DisableNameChecking
Import-Module "$PSScriptRoot/SoftwareReport.WebServers.psm1" -DisableNameChecking
-Import-Module "$PSScriptRoot/../helpers/SoftwareReport.Helpers.psm1"
+Import-Module "$PSScriptRoot/SoftwareReport.Helpers.psm1" -DisableNameChecking
Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1"
Import-Module "$PSScriptRoot/../helpers/Xcode.Helpers.psm1"
diff --git a/images/macos/scripts/docs-gen/SoftwareReport.Android.psm1 b/images/macos/scripts/docs-gen/SoftwareReport.Android.psm1
index 08f4b074..22cf4a5c 100644
--- a/images/macos/scripts/docs-gen/SoftwareReport.Android.psm1
+++ b/images/macos/scripts/docs-gen/SoftwareReport.Android.psm1
@@ -1,4 +1,4 @@
-Import-Module "$PSScriptRoot/../helpers/SoftwareReport.Helpers.psm1" -DisableNameChecking
+Import-Module "$PSScriptRoot/SoftwareReport.Helpers.psm1" -DisableNameChecking
Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1"
function Split-TableRowByColumns {
diff --git a/images/macos/scripts/helpers/SoftwareReport.Helpers.psm1 b/images/macos/scripts/docs-gen/SoftwareReport.Helpers.psm1
similarity index 100%
rename from images/macos/scripts/helpers/SoftwareReport.Helpers.psm1
rename to images/macos/scripts/docs-gen/SoftwareReport.Helpers.psm1
diff --git a/images/macos/scripts/helpers/invoke-tests.sh b/images/macos/scripts/helpers/invoke-tests.sh
index c71d0403..232d3c0a 100644
--- a/images/macos/scripts/helpers/invoke-tests.sh
+++ b/images/macos/scripts/helpers/invoke-tests.sh
@@ -1,5 +1,5 @@
#!/bin/bash -e -o pipefail
source $HOME/.bashrc
-pwsh -Command "Import-Module '$HOME/image-generation/helpers/Tests.Helpers.psm1' -DisableNameChecking
+pwsh -Command "Import-Module '$HOME/image-generation/tests/Helpers.psm1' -DisableNameChecking
Invoke-PesterTests -TestFile \"$1\" -TestName \"$2\""
diff --git a/images/macos/scripts/tests/Android.Tests.ps1 b/images/macos/scripts/tests/Android.Tests.ps1
index fe247262..335fb7e0 100644
--- a/images/macos/scripts/tests/Android.Tests.ps1
+++ b/images/macos/scripts/tests/Android.Tests.ps1
@@ -1,5 +1,5 @@
Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1"
-Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking
+Import-Module "$PSScriptRoot/Helpers.psm1" -DisableNameChecking
Import-Module "$PSScriptRoot/../software-report/SoftwareReport.Android.psm1" -DisableNameChecking
$os = Get-OSVersion
diff --git a/images/macos/scripts/tests/Common.Tests.ps1 b/images/macos/scripts/tests/Common.Tests.ps1
index c7c812aa..de8f6aef 100644
--- a/images/macos/scripts/tests/Common.Tests.ps1
+++ b/images/macos/scripts/tests/Common.Tests.ps1
@@ -1,5 +1,5 @@
Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1"
-Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking
+Import-Module "$PSScriptRoot/Helpers.psm1" -DisableNameChecking
$os = Get-OSVersion
diff --git a/images/macos/scripts/helpers/Tests.Helpers.psm1 b/images/macos/scripts/tests/Helpers.psm1
similarity index 98%
rename from images/macos/scripts/helpers/Tests.Helpers.psm1
rename to images/macos/scripts/tests/Helpers.psm1
index 528a0857..5f6fa593 100644
--- a/images/macos/scripts/helpers/Tests.Helpers.psm1
+++ b/images/macos/scripts/tests/Helpers.psm1
@@ -1,4 +1,4 @@
-Import-Module "$PSScriptRoot/Common.Helpers.psm1"
+Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1"
# Validates that tool is installed and in PATH
function Validate-ToolExist($tool) {
@@ -149,4 +149,4 @@ function Invoke-PesterTests {
$results
throw "Test run has failed"
}
-}
\ No newline at end of file
+}
diff --git a/images/macos/scripts/tests/Java.Tests.ps1 b/images/macos/scripts/tests/Java.Tests.ps1
index 65238c1d..fb2e948f 100644
--- a/images/macos/scripts/tests/Java.Tests.ps1
+++ b/images/macos/scripts/tests/Java.Tests.ps1
@@ -1,5 +1,5 @@
Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1"
-Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking
+Import-Module "$PSScriptRoot/Helpers.psm1" -DisableNameChecking
$os = Get-OSVersion
$arch = Get-Architecture
diff --git a/images/macos/scripts/tests/LLVM.Tests.ps1 b/images/macos/scripts/tests/LLVM.Tests.ps1
index af5b6353..964718e7 100644
--- a/images/macos/scripts/tests/LLVM.Tests.ps1
+++ b/images/macos/scripts/tests/LLVM.Tests.ps1
@@ -1,3 +1,5 @@
+Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1"
+
Describe "Clang/LLVM" {
BeforeAll {
$toolsetVersion = Get-ToolsetValue 'llvm.version'
@@ -7,4 +9,4 @@ Describe "Clang/LLVM" {
$clangVersion = & "$(brew --prefix llvm@$toolsetVersion)/bin/clang" --version
$clangVersion[0] | Should -BeLike "*${toolsetVersion}*"
}
-}
\ No newline at end of file
+}
diff --git a/images/macos/scripts/tests/Linters.Tests.ps1 b/images/macos/scripts/tests/Linters.Tests.ps1
index 38fcfda5..987abc98 100644
--- a/images/macos/scripts/tests/Linters.Tests.ps1
+++ b/images/macos/scripts/tests/Linters.Tests.ps1
@@ -1,4 +1,4 @@
-Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking
+Import-Module "$PSScriptRoot/Helpers.psm1" -DisableNameChecking
$os = Get-OSVersion
diff --git a/images/macos/scripts/tests/Node.Tests.ps1 b/images/macos/scripts/tests/Node.Tests.ps1
index 28a81f63..7e3757fa 100644
--- a/images/macos/scripts/tests/Node.Tests.ps1
+++ b/images/macos/scripts/tests/Node.Tests.ps1
@@ -1,5 +1,5 @@
Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1"
-Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking
+Import-Module "$PSScriptRoot/Helpers.psm1" -DisableNameChecking
$os = Get-OSVersion
diff --git a/images/macos/scripts/tests/Powershell.Tests.ps1 b/images/macos/scripts/tests/Powershell.Tests.ps1
index 93995747..fa4c6e2a 100644
--- a/images/macos/scripts/tests/Powershell.Tests.ps1
+++ b/images/macos/scripts/tests/Powershell.Tests.ps1
@@ -1,5 +1,5 @@
Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1"
-Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking
+Import-Module "$PSScriptRoot/Helpers.psm1" -DisableNameChecking
Describe "Powershell" {
Context "Powershell is installed" {
@@ -40,4 +40,4 @@ Describe "Powershell" {
}
}
}
-}
\ No newline at end of file
+}
diff --git a/images/macos/scripts/tests/Python.Tests.ps1 b/images/macos/scripts/tests/Python.Tests.ps1
index 6126ee9f..84e85a08 100644
--- a/images/macos/scripts/tests/Python.Tests.ps1
+++ b/images/macos/scripts/tests/Python.Tests.ps1
@@ -1,5 +1,5 @@
Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1"
-Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking
+Import-Module "$PSScriptRoot/Helpers.psm1" -DisableNameChecking
$os = Get-OSVersion
diff --git a/images/macos/scripts/tests/Ruby.arm64.Tests.ps1 b/images/macos/scripts/tests/Ruby.arm64.Tests.ps1
index cb0dacf9..64873954 100644
--- a/images/macos/scripts/tests/Ruby.arm64.Tests.ps1
+++ b/images/macos/scripts/tests/Ruby.arm64.Tests.ps1
@@ -1,5 +1,5 @@
Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1"
-Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking
+Import-Module "$PSScriptRoot/Helpers.psm1" -DisableNameChecking
$os = Get-OSVersion
diff --git a/images/macos/scripts/tests/Ruby.x64.Tests.ps1 b/images/macos/scripts/tests/Ruby.x64.Tests.ps1
index 97dc24ca..ded146dd 100644
--- a/images/macos/scripts/tests/Ruby.x64.Tests.ps1
+++ b/images/macos/scripts/tests/Ruby.x64.Tests.ps1
@@ -1,5 +1,5 @@
Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1"
-Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking
+Import-Module "$PSScriptRoot/Helpers.psm1" -DisableNameChecking
$os = Get-OSVersion
diff --git a/images/macos/scripts/tests/RunAll-Tests.ps1 b/images/macos/scripts/tests/RunAll-Tests.ps1
index 015491cd..7ac54608 100644
--- a/images/macos/scripts/tests/RunAll-Tests.ps1
+++ b/images/macos/scripts/tests/RunAll-Tests.ps1
@@ -1,3 +1,3 @@
-Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking
+Import-Module "$PSScriptRoot/Helpers.psm1" -DisableNameChecking
-Invoke-PesterTests "*"
\ No newline at end of file
+Invoke-PesterTests "*"
diff --git a/images/macos/scripts/tests/Toolcache.Tests.ps1 b/images/macos/scripts/tests/Toolcache.Tests.ps1
index d71ca1a8..e2b1a722 100644
--- a/images/macos/scripts/tests/Toolcache.Tests.ps1
+++ b/images/macos/scripts/tests/Toolcache.Tests.ps1
@@ -1,5 +1,5 @@
Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1"
-Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking
+Import-Module "$PSScriptRoot/Helpers.psm1" -DisableNameChecking
$arch = Get-Architecture
$os = Get-OSVersion
diff --git a/images/macos/scripts/tests/Toolset.Tests.ps1 b/images/macos/scripts/tests/Toolset.Tests.ps1
index 098d1562..5baef204 100644
--- a/images/macos/scripts/tests/Toolset.Tests.ps1
+++ b/images/macos/scripts/tests/Toolset.Tests.ps1
@@ -1,4 +1,4 @@
-Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1"
+Import-Module "$PSScriptRoot/Helpers.psm1"
$toolsets = Get-ChildItem -Path $PSScriptRoot -Filter "toolset-*.json"
@@ -141,4 +141,4 @@ $toolsets | ForEach-Object {
}
}
-}
\ No newline at end of file
+}
diff --git a/images/macos/scripts/tests/Xamarin.Tests.ps1 b/images/macos/scripts/tests/Xamarin.Tests.ps1
index 8eb12ba3..501ade25 100644
--- a/images/macos/scripts/tests/Xamarin.Tests.ps1
+++ b/images/macos/scripts/tests/Xamarin.Tests.ps1
@@ -1,5 +1,5 @@
Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1"
-Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking
+Import-Module "$PSScriptRoot/Helpers.psm1" -DisableNameChecking
$os = Get-OSVersion
if ($os.IsVentura -or $os.IsSonoma) {
diff --git a/images/macos/scripts/tests/Xcode.Tests.ps1 b/images/macos/scripts/tests/Xcode.Tests.ps1
index 6909fdcb..6ef32baa 100644
--- a/images/macos/scripts/tests/Xcode.Tests.ps1
+++ b/images/macos/scripts/tests/Xcode.Tests.ps1
@@ -1,6 +1,6 @@
Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1"
Import-Module "$PSScriptRoot/../helpers/Xcode.Helpers.psm1"
-Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking
+Import-Module "$PSScriptRoot/Helpers.psm1" -DisableNameChecking
$ARCH = Get-Architecture
$xcodeVersions = Get-ToolsetValue "xcode.$ARCH.versions"
@@ -133,4 +133,4 @@ Describe "Xcode Simulators Naming" -Skip:(-not $os.IsMonterey) {
$foundSimulators | Should -HaveCount 1
$foundSimulators[0].deviceTypeIdentifier | Should -Be $DeviceId
}
-}
\ No newline at end of file
+}
diff --git a/images/macos/templates/macOS-11.json b/images/macos/templates/macOS-11.json
index 4e980435..ded01dd9 100644
--- a/images/macos/templates/macOS-11.json
+++ b/images/macos/templates/macOS-11.json
@@ -100,22 +100,22 @@
"type": "shell",
"execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}",
"scripts": [
- "./scripts/build/xcode-clt.sh",
- "./scripts/build/homebrew.sh"
+ "./scripts/build/install-xcode-clt.sh",
+ "./scripts/build/install-homebrew.sh"
]
},
{
"type": "shell",
"execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}",
"scripts": [
- "./scripts/build/xcode-clt.sh",
- "./scripts/build/add-network-interface-detection.sh",
- "./scripts/build/autologin.sh",
- "./scripts/build/disable-auto-updates.sh",
- "./scripts/build/screensaver-off.sh",
- "./scripts/build/ntpconf.sh",
- "./scripts/build/max-files.sh",
- "./scripts/build/shell-change.sh"
+ "./scripts/build/install-xcode-clt.sh",
+ "./scripts/build/configure-network-interface-detection.sh",
+ "./scripts/build/configure-autologin.sh",
+ "./scripts/build/configure-auto-updates.sh",
+ "./scripts/build/configure-screensaver.sh",
+ "./scripts/build/configure-ntpconf.sh",
+ "./scripts/build/configure-max-files-limitation.sh",
+ "./scripts/build/configure-shell.sh"
],
"environment_vars": [
"PASSWORD={{user `vm_password`}}",
@@ -126,7 +126,7 @@
"type": "shell",
"execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}",
"scripts": [
- "./scripts/build/preimagedata.sh",
+ "./scripts/build/configure-preimagedata.sh",
"./scripts/build/configure-ssh.sh",
"./scripts/build/configure-machine.sh"
],
@@ -137,8 +137,11 @@
},
{
"type": "shell",
- "execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}",
- "script": "./scripts/build/reboot.sh",
+ "execute_command": "sudo {{ .Vars }} {{ .Path }}",
+ "inline": [
+ "echo 'Reboot VM'",
+ "shutdown -r now"
+ ],
"expect_disconnect": true
},
{
@@ -146,17 +149,17 @@
"execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}",
"pause_before": "30s",
"scripts": [
- "./scripts/build/open_windows_check.sh",
- "./scripts/build/powershell.sh",
- "./scripts/build/dotnet.sh",
- "./scripts/build/python.sh",
- "./scripts/build/azcopy.sh",
- "./scripts/build/openssl.sh",
- "./scripts/build/ruby.sh",
- "./scripts/build/rubygem.sh",
- "./scripts/build/git.sh",
- "./scripts/build/mongodb.sh",
- "./scripts/build/node.sh"
+ "./scripts/build/configure-windows.sh",
+ "./scripts/build/install-powershell.sh",
+ "./scripts/build/install-dotnet.sh",
+ "./scripts/build/install-python.sh",
+ "./scripts/build/install-azcopy.sh",
+ "./scripts/build/install-openssl.sh",
+ "./scripts/build/install-ruby.sh",
+ "./scripts/build/install-rubygems.sh",
+ "./scripts/build/install-git.sh",
+ "./scripts/build/install-mongodb.sh",
+ "./scripts/build/install-node.sh"
],
"environment_vars": [
"API_PAT={{user `github_api_pat`}}"
@@ -165,7 +168,7 @@
{
"type": "shell",
"execute_command": "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}",
- "script": "./scripts/build/xcode.ps1",
+ "script": "./scripts/build/Install-Xcode.ps1",
"environment_vars": [
"XCODE_INSTALL_STORAGE_URL={{user `xcode_install_storage_url`}}",
"XCODE_INSTALL_SAS={{user `xcode_install_sas`}}"
@@ -173,44 +176,47 @@
},
{
"type": "shell",
- "execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}",
- "script": "./scripts/build/reboot.sh",
+ "execute_command": "sudo {{ .Vars }} {{ .Path }}",
+ "inline": [
+ "echo 'Reboot VM'",
+ "shutdown -r now"
+ ],
"expect_disconnect": true
},
{
"type": "shell",
"execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}",
"scripts": [
- "./scripts/build/action-archive-cache.sh",
- "./scripts/build/commonutils.sh",
- "./scripts/build/llvm.sh",
- "./scripts/build/golang.sh",
- "./scripts/build/swiftlint.sh",
- "./scripts/build/openjdk.sh",
- "./scripts/build/php.sh",
- "./scripts/build/aws.sh",
- "./scripts/build/rust.sh",
- "./scripts/build/gcc.sh",
- "./scripts/build/haskell.sh",
- "./scripts/build/cocoapods.sh",
- "./scripts/build/android-toolsets.sh",
- "./scripts/build/xamarin.sh",
- "./scripts/build/vsmac.sh",
- "./scripts/build/nvm.sh",
- "./scripts/build/apache.sh",
- "./scripts/build/nginx.sh",
- "./scripts/build/postgresql.sh",
- "./scripts/build/audiodevice.sh",
- "./scripts/build/vcpkg.sh",
- "./scripts/build/miniconda.sh",
- "./scripts/build/safari.sh",
- "./scripts/build/chrome.sh",
- "./scripts/build/edge.sh",
- "./scripts/build/firefox.sh",
- "./scripts/build/pypy.sh",
- "./scripts/build/pipx-packages.sh",
- "./scripts/build/bicep.sh",
- "./scripts/build/codeql-bundle.sh"
+ "./scripts/build/install-actions-cache.sh",
+ "./scripts/build/install-common-utils.sh",
+ "./scripts/build/install-llvm.sh",
+ "./scripts/build/install-golang.sh",
+ "./scripts/build/install-swiftlint.sh",
+ "./scripts/build/install-openjdk.sh",
+ "./scripts/build/install-php.sh",
+ "./scripts/build/install-aws-tools.sh",
+ "./scripts/build/install-rust.sh",
+ "./scripts/build/install-gcc.sh",
+ "./scripts/build/install-haskell.sh",
+ "./scripts/build/install-cocoapods.sh",
+ "./scripts/build/install-android-sdk.sh",
+ "./scripts/build/install-xamarin.sh",
+ "./scripts/build/install-visualstudio.sh",
+ "./scripts/build/install-nvm.sh",
+ "./scripts/build/install-apache.sh",
+ "./scripts/build/install-nginx.sh",
+ "./scripts/build/install-postgresql.sh",
+ "./scripts/build/install-audiodevice.sh",
+ "./scripts/build/install-vcpkg.sh",
+ "./scripts/build/install-miniconda.sh",
+ "./scripts/build/install-safari.sh",
+ "./scripts/build/install-chrome.sh",
+ "./scripts/build/install-edge.sh",
+ "./scripts/build/install-firefox.sh",
+ "./scripts/build/install-pypy.sh",
+ "./scripts/build/install-pipx-packages.sh",
+ "./scripts/build/install-bicep.sh",
+ "./scripts/build/install-codeql-bundle.sh"
],
"environment_vars": [
"API_PAT={{user `github_api_pat`}}"
@@ -220,21 +226,21 @@
"type": "shell",
"execute_command": "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}",
"scripts": [
- "./scripts/build/toolset.ps1",
- "./scripts/build/configure-toolset.ps1"
+ "./scripts/build/Install-Toolset.ps1",
+ "./scripts/build/Configure-Toolset.ps1"
]
},
{
"type": "shell",
"execute_command": "ruby {{ .Path }}",
"scripts": [
- "./scripts/build/delete-duplicate-sims.rb"
+ "./scripts/build/configure-xcode-simulators.rb"
]
},
{
"type": "shell",
"inline": [
- "pwsh -File \"$HOME/image-generation/software-report/SoftwareReport.Generator.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName {{user `build_id`}}",
+ "pwsh -File \"$HOME/image-generation/software-report/Generate-SoftwareReport.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName {{user `build_id`}}",
"pwsh -File \"$HOME/image-generation/tests/RunAll-Tests.ps1\""
]
},
@@ -249,7 +255,7 @@
"execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}",
"scripts": [
"./scripts/build/configure-hostname.sh",
- "./scripts/build/finalize-vm.sh"
+ "./scripts/build/configure-system.sh"
]
}
]
diff --git a/images/macos/templates/macOS-12.anka.pkr.hcl b/images/macos/templates/macOS-12.anka.pkr.hcl
index 1850c957..2e852325 100644
--- a/images/macos/templates/macOS-12.anka.pkr.hcl
+++ b/images/macos/templates/macOS-12.anka.pkr.hcl
@@ -129,21 +129,21 @@ build {
}
provisioner "shell" {
scripts = [
- "./scripts/build/xcode-clt.sh",
- "./scripts/build/homebrew.sh"
+ "./scripts/build/install-xcode-clt.sh",
+ "./scripts/build/install-homebrew.sh"
]
execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}"
}
provisioner "shell" {
scripts = [
"./scripts/build/configure-tccdb-macos.sh",
- "./scripts/build/add-network-interface-detection.sh",
- "./scripts/build/autologin.sh",
- "./scripts/build/disable-auto-updates.sh",
- "./scripts/build/screensaver-off.sh",
- "./scripts/build/ntpconf.sh",
- "./scripts/build/max-files.sh",
- "./scripts/build/shell-change.sh"
+ "./scripts/build/configure-network-interface-detection.sh",
+ "./scripts/build/configure-autologin.sh",
+ "./scripts/build/configure-auto-updates.sh",
+ "./scripts/build/configure-screensaver.sh",
+ "./scripts/build/configure-ntpconf.sh",
+ "./scripts/build/configure-max-files-limitation.sh",
+ "./scripts/build/configure-shell.sh"
]
environment_vars = [
"PASSWORD=${var.vm_password}",
@@ -153,7 +153,7 @@ build {
}
provisioner "shell" {
scripts = [
- "./scripts/build/preimagedata.sh",
+ "./scripts/build/configure-preimagedata.sh",
"./scripts/build/configure-ssh.sh",
"./scripts/build/configure-machine.sh"
]
@@ -165,25 +165,25 @@ build {
execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}"
}
provisioner "shell" {
- script = "./scripts/build/reboot.sh"
- execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}"
+ execute_command = "source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}"
expect_disconnect = true
+ inline = ["echo 'Reboot VM'", "shutdown -r now"]
}
provisioner "shell" {
pause_before = "30s"
scripts = [
- "./scripts/build/open_windows_check.sh",
- "./scripts/build/powershell.sh",
- "./scripts/build/dotnet.sh",
- "./scripts/build/python.sh",
- "./scripts/build/azcopy.sh",
- "./scripts/build/openssl.sh",
- "./scripts/build/ruby.sh",
- "./scripts/build/rubygem.sh",
- "./scripts/build/git.sh",
- "./scripts/build/mongodb.sh",
- "./scripts/build/node.sh",
- "./scripts/build/commonutils.sh"
+ "./scripts/build/configure-windows.sh",
+ "./scripts/build/install-powershell.sh",
+ "./scripts/build/install-dotnet.sh",
+ "./scripts/build/install-python.sh",
+ "./scripts/build/install-azcopy.sh",
+ "./scripts/build/install-openssl.sh",
+ "./scripts/build/install-ruby.sh",
+ "./scripts/build/install-rubygems.sh",
+ "./scripts/build/install-git.sh",
+ "./scripts/build/install-mongodb.sh",
+ "./scripts/build/install-node.sh",
+ "./scripts/build/install-common-utils.sh"
]
environment_vars = [
"API_PAT=${var.github_api_pat}",
@@ -192,7 +192,7 @@ build {
execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}"
}
provisioner "shell" {
- script = "./scripts/build/xcode.ps1"
+ script = "./scripts/build/Install-Xcode.ps1"
environment_vars = [
"XCODE_INSTALL_STORAGE_URL=${var.xcode_install_storage_url}",
"XCODE_INSTALL_SAS=${var.xcode_install_sas}"
@@ -200,41 +200,41 @@ build {
execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}"
}
provisioner "shell" {
- script = "./scripts/build/reboot.sh"
- execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}"
+ execute_command = "source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}"
expect_disconnect = true
+ inline = ["echo 'Reboot VM'", "shutdown -r now"]
}
provisioner "shell" {
scripts = [
- "./scripts/build/action-archive-cache.sh",
- "./scripts/build/llvm.sh",
- "./scripts/build/golang.sh",
- "./scripts/build/swiftlint.sh",
- "./scripts/build/openjdk.sh",
- "./scripts/build/php.sh",
- "./scripts/build/aws.sh",
- "./scripts/build/rust.sh",
- "./scripts/build/gcc.sh",
- "./scripts/build/haskell.sh",
- "./scripts/build/cocoapods.sh",
- "./scripts/build/android-toolsets.sh",
- "./scripts/build/xamarin.sh",
- "./scripts/build/vsmac.sh",
- "./scripts/build/nvm.sh",
- "./scripts/build/apache.sh",
- "./scripts/build/nginx.sh",
- "./scripts/build/postgresql.sh",
- "./scripts/build/audiodevice.sh",
- "./scripts/build/vcpkg.sh",
- "./scripts/build/miniconda.sh",
- "./scripts/build/safari.sh",
- "./scripts/build/chrome.sh",
- "./scripts/build/edge.sh",
- "./scripts/build/firefox.sh",
- "./scripts/build/pypy.sh",
- "./scripts/build/pipx-packages.sh",
- "./scripts/build/bicep.sh",
- "./scripts/build/codeql-bundle.sh"
+ "./scripts/build/install-actions-cache.sh",
+ "./scripts/build/install-llvm.sh",
+ "./scripts/build/install-golang.sh",
+ "./scripts/build/install-swiftlint.sh",
+ "./scripts/build/install-openjdk.sh",
+ "./scripts/build/install-php.sh",
+ "./scripts/build/install-aws-tools.sh",
+ "./scripts/build/install-rust.sh",
+ "./scripts/build/install-gcc.sh",
+ "./scripts/build/install-haskell.sh",
+ "./scripts/build/install-cocoapods.sh",
+ "./scripts/build/install-android-sdk.sh",
+ "./scripts/build/install-xamarin.sh",
+ "./scripts/build/install-visualstudio.sh",
+ "./scripts/build/install-nvm.sh",
+ "./scripts/build/install-apache.sh",
+ "./scripts/build/install-nginx.sh",
+ "./scripts/build/install-postgresql.sh",
+ "./scripts/build/install-audiodevice.sh",
+ "./scripts/build/install-vcpkg.sh",
+ "./scripts/build/install-miniconda.sh",
+ "./scripts/build/install-safari.sh",
+ "./scripts/build/install-chrome.sh",
+ "./scripts/build/install-edge.sh",
+ "./scripts/build/install-firefox.sh",
+ "./scripts/build/install-pypy.sh",
+ "./scripts/build/install-pipx-packages.sh",
+ "./scripts/build/install-bicep.sh",
+ "./scripts/build/install-codeql-bundle.sh"
]
environment_vars = [
"API_PAT=${var.github_api_pat}"
@@ -243,22 +243,22 @@ build {
}
provisioner "shell" {
scripts = [
- "./scripts/build/toolset.ps1",
- "./scripts/build/configure-toolset.ps1"
+ "./scripts/build/Install-Toolset.ps1",
+ "./scripts/build/Configure-Toolset.ps1"
]
execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}"
}
provisioner "shell" {
- script = "./scripts/build/delete-duplicate-sims.rb"
+ script = "./scripts/build/configure-xcode-simulators.rb"
execute_command = "source $HOME/.bash_profile; ruby {{ .Path }}"
}
provisioner "shell" {
- script = "./scripts/build/fix-xcode-simulators.ps1"
+ script = "./scripts/build/Update-XcodeSimulators.ps1"
execute_command = "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}"
}
provisioner "shell" {
inline = [
- "pwsh -File \"$HOME/image-generation/software-report/SoftwareReport.Generator.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName ${var.build_id}",
+ "pwsh -File \"$HOME/image-generation/software-report/Generate-SoftwareReport.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName ${var.build_id}",
"pwsh -File \"$HOME/image-generation/tests/RunAll-Tests.ps1\""
]
execute_command = "source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}"
@@ -271,7 +271,7 @@ build {
provisioner "shell" {
scripts = [
"./scripts/build/configure-hostname.sh",
- "./scripts/build/finalize-vm.sh"
+ "./scripts/build/configure-system.sh"
]
execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}"
}
diff --git a/images/macos/templates/macOS-12.json b/images/macos/templates/macOS-12.json
index ed9119b8..7ca2da13 100644
--- a/images/macos/templates/macOS-12.json
+++ b/images/macos/templates/macOS-12.json
@@ -100,21 +100,21 @@
"type": "shell",
"execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}",
"scripts": [
- "./scripts/build/xcode-clt.sh",
- "./scripts/build/homebrew.sh"
+ "./scripts/build/install-xcode-clt.sh",
+ "./scripts/build/install-homebrew.sh"
]
},
{
"type": "shell",
"execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}",
"scripts": [
- "./scripts/build/add-network-interface-detection.sh",
- "./scripts/build/autologin.sh",
- "./scripts/build/disable-auto-updates.sh",
- "./scripts/build/screensaver-off.sh",
- "./scripts/build/ntpconf.sh",
- "./scripts/build/max-files.sh",
- "./scripts/build/shell-change.sh"
+ "./scripts/build/configure-network-interface-detection.sh",
+ "./scripts/build/configure-autologin.sh",
+ "./scripts/build/configure-auto-updates.sh",
+ "./scripts/build/configure-screensaver.sh",
+ "./scripts/build/configure-ntpconf.sh",
+ "./scripts/build/configure-max-files-limitation.sh",
+ "./scripts/build/configure-shell.sh"
],
"environment_vars": [
"PASSWORD={{user `vm_password`}}",
@@ -125,7 +125,7 @@
"type": "shell",
"execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}",
"scripts": [
- "./scripts/build/preimagedata.sh",
+ "./scripts/build/configure-preimagedata.sh",
"./scripts/build/configure-ssh.sh",
"./scripts/build/configure-machine.sh"
],
@@ -137,8 +137,11 @@
},
{
"type": "shell",
- "execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}",
- "script": "./scripts/build/reboot.sh",
+ "execute_command": "sudo {{ .Vars }} {{ .Path }}",
+ "inline": [
+ "echo 'Reboot VM'",
+ "shutdown -r now"
+ ],
"expect_disconnect": true
},
{
@@ -146,18 +149,18 @@
"execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}",
"pause_before": "30s",
"scripts": [
- "./scripts/build/open_windows_check.sh",
- "./scripts/build/powershell.sh",
- "./scripts/build/dotnet.sh",
- "./scripts/build/python.sh",
- "./scripts/build/azcopy.sh",
- "./scripts/build/openssl.sh",
- "./scripts/build/ruby.sh",
- "./scripts/build/rubygem.sh",
- "./scripts/build/git.sh",
- "./scripts/build/mongodb.sh",
- "./scripts/build/node.sh",
- "./scripts/build/commonutils.sh"
+ "./scripts/build/configure-windows.sh",
+ "./scripts/build/install-powershell.sh",
+ "./scripts/build/install-dotnet.sh",
+ "./scripts/build/install-python.sh",
+ "./scripts/build/install-azcopy.sh",
+ "./scripts/build/install-openssl.sh",
+ "./scripts/build/install-ruby.sh",
+ "./scripts/build/install-rubygems.sh",
+ "./scripts/build/install-git.sh",
+ "./scripts/build/install-mongodb.sh",
+ "./scripts/build/install-node.sh",
+ "./scripts/build/install-common-utils.sh"
],
"environment_vars": [
"API_PAT={{user `github_api_pat`}}",
@@ -167,7 +170,7 @@
{
"type": "shell",
"execute_command": "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}",
- "script": "./scripts/build/xcode.ps1",
+ "script": "./scripts/build/Install-Xcode.ps1",
"environment_vars": [
"XCODE_INSTALL_STORAGE_URL={{user `xcode_install_storage_url`}}",
"XCODE_INSTALL_SAS={{user `xcode_install_sas`}}"
@@ -175,43 +178,46 @@
},
{
"type": "shell",
- "execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}",
- "script": "./scripts/build/reboot.sh",
+ "execute_command": "sudo {{ .Vars }} {{ .Path }}",
+ "inline": [
+ "echo 'Reboot VM'",
+ "shutdown -r now"
+ ],
"expect_disconnect": true
},
{
"type": "shell",
"execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}",
"scripts": [
- "./scripts/build/action-archive-cache.sh",
- "./scripts/build/llvm.sh",
- "./scripts/build/golang.sh",
- "./scripts/build/swiftlint.sh",
- "./scripts/build/openjdk.sh",
- "./scripts/build/php.sh",
- "./scripts/build/aws.sh",
- "./scripts/build/rust.sh",
- "./scripts/build/gcc.sh",
- "./scripts/build/haskell.sh",
- "./scripts/build/cocoapods.sh",
- "./scripts/build/android-toolsets.sh",
- "./scripts/build/xamarin.sh",
- "./scripts/build/vsmac.sh",
- "./scripts/build/nvm.sh",
- "./scripts/build/apache.sh",
- "./scripts/build/nginx.sh",
- "./scripts/build/postgresql.sh",
- "./scripts/build/audiodevice.sh",
- "./scripts/build/vcpkg.sh",
- "./scripts/build/miniconda.sh",
- "./scripts/build/safari.sh",
- "./scripts/build/chrome.sh",
- "./scripts/build/edge.sh",
- "./scripts/build/firefox.sh",
- "./scripts/build/pypy.sh",
- "./scripts/build/pipx-packages.sh",
- "./scripts/build/bicep.sh",
- "./scripts/build/codeql-bundle.sh"
+ "./scripts/build/install-actions-cache.sh",
+ "./scripts/build/install-llvm.sh",
+ "./scripts/build/install-golang.sh",
+ "./scripts/build/install-swiftlint.sh",
+ "./scripts/build/install-openjdk.sh",
+ "./scripts/build/install-php.sh",
+ "./scripts/build/install-aws-tools.sh",
+ "./scripts/build/install-rust.sh",
+ "./scripts/build/install-gcc.sh",
+ "./scripts/build/install-haskell.sh",
+ "./scripts/build/install-cocoapods.sh",
+ "./scripts/build/install-android-sdk.sh",
+ "./scripts/build/install-xamarin.sh",
+ "./scripts/build/install-visualstudio.sh",
+ "./scripts/build/install-nvm.sh",
+ "./scripts/build/install-apache.sh",
+ "./scripts/build/install-nginx.sh",
+ "./scripts/build/install-postgresql.sh",
+ "./scripts/build/install-audiodevice.sh",
+ "./scripts/build/install-vcpkg.sh",
+ "./scripts/build/install-miniconda.sh",
+ "./scripts/build/install-safari.sh",
+ "./scripts/build/install-chrome.sh",
+ "./scripts/build/install-edge.sh",
+ "./scripts/build/install-firefox.sh",
+ "./scripts/build/install-pypy.sh",
+ "./scripts/build/install-pipx-packages.sh",
+ "./scripts/build/install-bicep.sh",
+ "./scripts/build/install-codeql-bundle.sh"
],
"environment_vars": [
"API_PAT={{user `github_api_pat`}}"
@@ -221,26 +227,26 @@
"type": "shell",
"execute_command": "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}",
"scripts": [
- "./scripts/build/toolset.ps1",
- "./scripts/build/configure-toolset.ps1"
+ "./scripts/build/Install-Toolset.ps1",
+ "./scripts/build/Configure-Toolset.ps1"
]
},
{
"type": "shell",
"execute_command": "ruby {{ .Path }}",
"scripts": [
- "./scripts/build/delete-duplicate-sims.rb"
+ "./scripts/build/configure-xcode-simulators.rb"
]
},
{
"type": "shell",
"execute_command": "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}",
- "script": "./scripts/build/fix-xcode-simulators.ps1"
+ "script": "./scripts/build/Update-XcodeSimulators.ps1"
},
{
"type": "shell",
"inline": [
- "pwsh -File \"$HOME/image-generation/software-report/SoftwareReport.Generator.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName {{user `build_id`}}",
+ "pwsh -File \"$HOME/image-generation/software-report/Generate-SoftwareReport.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName {{user `build_id`}}",
"pwsh -File \"$HOME/image-generation/tests/RunAll-Tests.ps1\""
]
},
@@ -255,7 +261,7 @@
"execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}",
"scripts": [
"./scripts/build/configure-hostname.sh",
- "./scripts/build/finalize-vm.sh"
+ "./scripts/build/configure-system.sh"
]
}
]
diff --git a/images/macos/templates/macOS-13.anka.pkr.hcl b/images/macos/templates/macOS-13.anka.pkr.hcl
index 3f8acc39..5600b2ef 100644
--- a/images/macos/templates/macOS-13.anka.pkr.hcl
+++ b/images/macos/templates/macOS-13.anka.pkr.hcl
@@ -129,17 +129,17 @@ build {
}
provisioner "shell" {
scripts = [
- "./scripts/build/xcode-clt.sh",
- "./scripts/build/homebrew.sh"
+ "./scripts/build/install-xcode-clt.sh",
+ "./scripts/build/install-homebrew.sh"
]
execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}"
}
provisioner "shell" {
scripts = [
"./scripts/build/configure-tccdb-macos.sh",
- "./scripts/build/disable-auto-updates.sh",
- "./scripts/build/ntpconf.sh",
- "./scripts/build/shell-change.sh"
+ "./scripts/build/configure-auto-updates.sh",
+ "./scripts/build/configure-ntpconf.sh",
+ "./scripts/build/configure-shell.sh"
]
environment_vars = [
"PASSWORD=${var.vm_password}",
@@ -149,7 +149,7 @@ build {
}
provisioner "shell" {
scripts = [
- "./scripts/build/preimagedata.sh",
+ "./scripts/build/configure-preimagedata.sh",
"./scripts/build/configure-ssh.sh",
"./scripts/build/configure-machine.sh"
]
@@ -161,25 +161,25 @@ build {
execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}"
}
provisioner "shell" {
- script = "./scripts/build/reboot.sh"
- execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}"
+ execute_command = "source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}"
expect_disconnect = true
+ inline = ["echo 'Reboot VM'", "shutdown -r now"]
}
provisioner "shell" {
pause_before = "30s"
scripts = [
- "./scripts/build/open_windows_check.sh",
- "./scripts/build/powershell.sh",
- "./scripts/build/mono.sh",
- "./scripts/build/dotnet.sh",
- "./scripts/build/python.sh",
- "./scripts/build/azcopy.sh",
- "./scripts/build/openssl.sh",
- "./scripts/build/ruby.sh",
- "./scripts/build/rubygem.sh",
- "./scripts/build/git.sh",
- "./scripts/build/node.sh",
- "./scripts/build/commonutils.sh"
+ "./scripts/build/configure-windows.sh",
+ "./scripts/build/install-powershell.sh",
+ "./scripts/build/install-mono.sh",
+ "./scripts/build/install-dotnet.sh",
+ "./scripts/build/install-python.sh",
+ "./scripts/build/install-azcopy.sh",
+ "./scripts/build/install-openssl.sh",
+ "./scripts/build/install-ruby.sh",
+ "./scripts/build/install-rubygems.sh",
+ "./scripts/build/install-git.sh",
+ "./scripts/build/install-node.sh",
+ "./scripts/build/install-common-utils.sh"
]
environment_vars = [
"API_PAT=${var.github_api_pat}",
@@ -188,7 +188,7 @@ build {
execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}"
}
provisioner "shell" {
- script = "./scripts/build/xcode.ps1"
+ script = "./scripts/build/Install-Xcode.ps1"
environment_vars = [
"XCODE_INSTALL_STORAGE_URL=${var.xcode_install_storage_url}",
"XCODE_INSTALL_SAS=${var.xcode_install_sas}"
@@ -196,31 +196,31 @@ build {
execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}"
}
provisioner "shell" {
- script = "./scripts/build/reboot.sh"
- execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}"
+ execute_command = "source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}"
expect_disconnect = true
+ inline = ["echo 'Reboot VM'", "shutdown -r now"]
}
provisioner "shell" {
scripts = [
- "./scripts/build/action-archive-cache.sh",
- "./scripts/build/llvm.sh",
- "./scripts/build/swiftlint.sh",
- "./scripts/build/openjdk.sh",
- "./scripts/build/php.sh",
- "./scripts/build/aws.sh",
- "./scripts/build/rust.sh",
- "./scripts/build/gcc.sh",
- "./scripts/build/cocoapods.sh",
- "./scripts/build/android-toolsets.sh",
- "./scripts/build/apache.sh",
- "./scripts/build/vcpkg.sh",
- "./scripts/build/safari.sh",
- "./scripts/build/chrome.sh",
- "./scripts/build/edge.sh",
- "./scripts/build/firefox.sh",
- "./scripts/build/pypy.sh",
- "./scripts/build/bicep.sh",
- "./scripts/build/codeql-bundle.sh"
+ "./scripts/build/install-actions-cache.sh",
+ "./scripts/build/install-llvm.sh",
+ "./scripts/build/install-swiftlint.sh",
+ "./scripts/build/install-openjdk.sh",
+ "./scripts/build/install-php.sh",
+ "./scripts/build/install-aws-tools.sh",
+ "./scripts/build/install-rust.sh",
+ "./scripts/build/install-gcc.sh",
+ "./scripts/build/install-cocoapods.sh",
+ "./scripts/build/install-android-sdk.sh",
+ "./scripts/build/install-apache.sh",
+ "./scripts/build/install-vcpkg.sh",
+ "./scripts/build/install-safari.sh",
+ "./scripts/build/install-chrome.sh",
+ "./scripts/build/install-edge.sh",
+ "./scripts/build/install-firefox.sh",
+ "./scripts/build/install-pypy.sh",
+ "./scripts/build/install-bicep.sh",
+ "./scripts/build/install-codeql-bundle.sh"
]
environment_vars = [
"API_PAT=${var.github_api_pat}"
@@ -229,18 +229,18 @@ build {
}
provisioner "shell" {
scripts = [
- "./scripts/build/toolset.ps1",
- "./scripts/build/configure-toolset.ps1"
+ "./scripts/build/Install-Toolset.ps1",
+ "./scripts/build/Configure-Toolset.ps1"
]
execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}"
}
provisioner "shell" {
- script = "./scripts/build/delete-duplicate-sims.rb"
+ script = "./scripts/build/configure-xcode-simulators.rb"
execute_command = "source $HOME/.bash_profile; ruby {{ .Path }}"
}
provisioner "shell" {
inline = [
- "pwsh -File \"$HOME/image-generation/software-report/SoftwareReport.Generator.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName ${var.build_id}",
+ "pwsh -File \"$HOME/image-generation/software-report/Generate-SoftwareReport.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName ${var.build_id}",
"pwsh -File \"$HOME/image-generation/tests/RunAll-Tests.ps1\""
]
execute_command = "source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}"
@@ -250,11 +250,15 @@ build {
direction = "download"
source = "./image-generation/output/"
}
+ provisioner "shell" {
+ inline = [
+ "rm -rf \"$(brew --cache)\""
+ ]
+ }
provisioner "shell" {
scripts = [
"./scripts/build/configure-hostname.sh",
- "./scripts/build/cleanup-brew.sh",
- "./scripts/build/finalize-vm.sh"
+ "./scripts/build/configure-system.sh"
]
execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}"
}
diff --git a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl
index 17ae11ec..1ab3ffc0 100644
--- a/images/macos/templates/macOS-13.arm64.anka.pkr.hcl
+++ b/images/macos/templates/macOS-13.arm64.anka.pkr.hcl
@@ -130,18 +130,18 @@ build {
}
provisioner "shell" {
scripts = [
- "./scripts/build/xcode-clt.sh",
- "./scripts/build/homebrew.sh",
- "./scripts/build/rosetta.sh"
+ "./scripts/build/install-xcode-clt.sh",
+ "./scripts/build/install-homebrew.sh",
+ "./scripts/build/install-rosetta.sh"
]
execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}"
}
provisioner "shell" {
scripts = [
"./scripts/build/configure-tccdb-macos.sh",
- "./scripts/build/disable-auto-updates.sh",
- "./scripts/build/ntpconf.sh",
- "./scripts/build/shell-change.sh"
+ "./scripts/build/configure-auto-updates.sh",
+ "./scripts/build/configure-ntpconf.sh",
+ "./scripts/build/configure-shell.sh"
]
environment_vars = [
"PASSWORD=${var.vm_password}",
@@ -151,7 +151,7 @@ build {
}
provisioner "shell" {
scripts = [
- "./scripts/build/preimagedata.sh",
+ "./scripts/build/configure-preimagedata.sh",
"./scripts/build/configure-ssh.sh",
"./scripts/build/configure-machine.sh"
]
@@ -163,24 +163,24 @@ build {
execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}"
}
provisioner "shell" {
- script = "./scripts/build/reboot.sh"
- execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}"
+ execute_command = "source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}"
expect_disconnect = true
+ inline = ["echo 'Reboot VM'", "shutdown -r now"]
}
provisioner "shell" {
pause_before = "30s"
scripts = [
- "./scripts/build/open_windows_check.sh",
- "./scripts/build/powershell.sh",
- "./scripts/build/mono.sh",
- "./scripts/build/dotnet.sh",
- "./scripts/build/azcopy.sh",
- "./scripts/build/openssl.sh",
- "./scripts/build/ruby.sh",
- "./scripts/build/rubygem.sh",
- "./scripts/build/git.sh",
- "./scripts/build/node.sh",
- "./scripts/build/commonutils.sh"
+ "./scripts/build/configure-windows.sh",
+ "./scripts/build/install-powershell.sh",
+ "./scripts/build/install-mono.sh",
+ "./scripts/build/install-dotnet.sh",
+ "./scripts/build/install-azcopy.sh",
+ "./scripts/build/install-openssl.sh",
+ "./scripts/build/install-ruby.sh",
+ "./scripts/build/install-rubygems.sh",
+ "./scripts/build/install-git.sh",
+ "./scripts/build/install-node.sh",
+ "./scripts/build/install-common-utils.sh"
]
environment_vars = [
"API_PAT=${var.github_api_pat}",
@@ -189,7 +189,7 @@ build {
execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}"
}
provisioner "shell" {
- script = "./scripts/build/xcode.ps1"
+ script = "./scripts/build/Install-Xcode.ps1"
environment_vars = [
"XCODE_INSTALL_STORAGE_URL=${var.xcode_install_storage_url}",
"XCODE_INSTALL_SAS=${var.xcode_install_sas}"
@@ -197,24 +197,24 @@ build {
execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}"
}
provisioner "shell" {
- script = "./scripts/build/reboot.sh"
- execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}"
+ execute_command = "source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}"
expect_disconnect = true
+ inline = ["echo 'Reboot VM'", "shutdown -r now"]
}
provisioner "shell" {
scripts = [
- "./scripts/build/action-archive-cache.sh",
- "./scripts/build/llvm.sh",
- "./scripts/build/openjdk.sh",
- "./scripts/build/aws.sh",
- "./scripts/build/rust.sh",
- "./scripts/build/gcc.sh",
- "./scripts/build/cocoapods.sh",
- "./scripts/build/android-toolsets.sh",
- "./scripts/build/safari.sh",
- "./scripts/build/chrome.sh",
- "./scripts/build/bicep.sh",
- "./scripts/build/codeql-bundle.sh"
+ "./scripts/build/install-actions-cache.sh",
+ "./scripts/build/install-llvm.sh",
+ "./scripts/build/install-openjdk.sh",
+ "./scripts/build/install-aws-tools.sh",
+ "./scripts/build/install-rust.sh",
+ "./scripts/build/install-gcc.sh",
+ "./scripts/build/install-cocoapods.sh",
+ "./scripts/build/install-android-sdk.sh",
+ "./scripts/build/install-safari.sh",
+ "./scripts/build/install-chrome.sh",
+ "./scripts/build/install-bicep.sh",
+ "./scripts/build/install-codeql-bundle.sh"
]
environment_vars = [
"API_PAT=${var.github_api_pat}"
@@ -223,18 +223,18 @@ build {
}
provisioner "shell" {
scripts = [
- "./scripts/build/toolset.ps1",
- "./scripts/build/configure-toolset.ps1"
+ "./scripts/build/Install-Toolset.ps1",
+ "./scripts/build/Configure-Toolset.ps1"
]
execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}"
}
provisioner "shell" {
- script = "./scripts/build/delete-duplicate-sims.rb"
+ script = "./scripts/build/configure-xcode-simulators.rb"
execute_command = "source $HOME/.bash_profile; ruby {{ .Path }}"
}
provisioner "shell" {
inline = [
- "pwsh -File \"$HOME/image-generation/software-report/SoftwareReport.Generator.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName ${var.build_id}",
+ "pwsh -File \"$HOME/image-generation/software-report/Generate-SoftwareReport.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName ${var.build_id}",
"pwsh -File \"$HOME/image-generation/tests/RunAll-Tests.ps1\""
]
execute_command = "source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}"
diff --git a/images/macos/templates/macOS-14.anka.pkr.hcl b/images/macos/templates/macOS-14.anka.pkr.hcl
index 907d8815..edcfbdc3 100644
--- a/images/macos/templates/macOS-14.anka.pkr.hcl
+++ b/images/macos/templates/macOS-14.anka.pkr.hcl
@@ -129,17 +129,17 @@ build {
}
provisioner "shell" {
scripts = [
- "./scripts/build/xcode-clt.sh",
- "./scripts/build/homebrew.sh"
+ "./scripts/build/install-xcode-clt.sh",
+ "./scripts/build/install-homebrew.sh"
]
execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}"
}
provisioner "shell" {
scripts = [
"./scripts/build/configure-tccdb-macos.sh",
- "./scripts/build/disable-auto-updates.sh",
- "./scripts/build/ntpconf.sh",
- "./scripts/build/shell-change.sh"
+ "./scripts/build/configure-auto-updates.sh",
+ "./scripts/build/configure-ntpconf.sh",
+ "./scripts/build/configure-shell.sh"
]
environment_vars = [
"PASSWORD=${var.vm_password}",
@@ -149,7 +149,7 @@ build {
}
provisioner "shell" {
scripts = [
- "./scripts/build/preimagedata.sh",
+ "./scripts/build/configure-preimagedata.sh",
"./scripts/build/configure-ssh.sh",
"./scripts/build/configure-machine.sh"
]
@@ -161,25 +161,25 @@ build {
execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}"
}
provisioner "shell" {
- script = "./scripts/build/reboot.sh"
- execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}"
+ execute_command = "source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}"
expect_disconnect = true
+ inline = ["echo 'Reboot VM'", "shutdown -r now"]
}
provisioner "shell" {
pause_before = "30s"
scripts = [
- "./scripts/build/open_windows_check.sh",
- "./scripts/build/powershell.sh",
- "./scripts/build/mono.sh",
- "./scripts/build/dotnet.sh",
- "./scripts/build/python.sh",
- "./scripts/build/azcopy.sh",
- "./scripts/build/openssl.sh",
- "./scripts/build/ruby.sh",
- "./scripts/build/rubygem.sh",
- "./scripts/build/git.sh",
- "./scripts/build/node.sh",
- "./scripts/build/commonutils.sh"
+ "./scripts/build/configure-windows.sh",
+ "./scripts/build/install-powershell.sh",
+ "./scripts/build/install-mono.sh",
+ "./scripts/build/install-dotnet.sh",
+ "./scripts/build/install-python.sh",
+ "./scripts/build/install-azcopy.sh",
+ "./scripts/build/install-openssl.sh",
+ "./scripts/build/install-ruby.sh",
+ "./scripts/build/install-rubygems.sh",
+ "./scripts/build/install-git.sh",
+ "./scripts/build/install-node.sh",
+ "./scripts/build/install-common-utils.sh"
]
environment_vars = [
"API_PAT=${var.github_api_pat}",
@@ -188,7 +188,7 @@ build {
execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}"
}
provisioner "shell" {
- script = "./scripts/build/xcode.ps1"
+ script = "./scripts/build/Install-Xcode.ps1"
environment_vars = [
"XCODE_INSTALL_STORAGE_URL=${var.xcode_install_storage_url}",
"XCODE_INSTALL_SAS=${var.xcode_install_sas}"
@@ -196,31 +196,31 @@ build {
execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}"
}
provisioner "shell" {
- script = "./scripts/build/reboot.sh"
- execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}"
+ execute_command = "source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}"
expect_disconnect = true
+ inline = ["echo 'Reboot VM'", "shutdown -r now"]
}
provisioner "shell" {
scripts = [
- "./scripts/build/action-archive-cache.sh",
- "./scripts/build/llvm.sh",
- "./scripts/build/swiftlint.sh",
- "./scripts/build/openjdk.sh",
- "./scripts/build/php.sh",
- "./scripts/build/aws.sh",
- "./scripts/build/rust.sh",
- "./scripts/build/gcc.sh",
- "./scripts/build/cocoapods.sh",
- "./scripts/build/android-toolsets.sh",
- "./scripts/build/apache.sh",
- "./scripts/build/vcpkg.sh",
- "./scripts/build/safari.sh",
- "./scripts/build/chrome.sh",
- "./scripts/build/edge.sh",
- "./scripts/build/firefox.sh",
- "./scripts/build/pypy.sh",
- "./scripts/build/bicep.sh",
- "./scripts/build/codeql-bundle.sh"
+ "./scripts/build/install-actions-cache.sh",
+ "./scripts/build/install-llvm.sh",
+ "./scripts/build/install-swiftlint.sh",
+ "./scripts/build/install-openjdk.sh",
+ "./scripts/build/install-php.sh",
+ "./scripts/build/install-aws-tools.sh",
+ "./scripts/build/install-rust.sh",
+ "./scripts/build/install-gcc.sh",
+ "./scripts/build/install-cocoapods.sh",
+ "./scripts/build/install-android-sdk.sh",
+ "./scripts/build/install-apache.sh",
+ "./scripts/build/install-vcpkg.sh",
+ "./scripts/build/install-safari.sh",
+ "./scripts/build/install-chrome.sh",
+ "./scripts/build/install-edge.sh",
+ "./scripts/build/install-firefox.sh",
+ "./scripts/build/install-pypy.sh",
+ "./scripts/build/install-bicep.sh",
+ "./scripts/build/install-codeql-bundle.sh"
]
environment_vars = [
"API_PAT=${var.github_api_pat}"
@@ -228,12 +228,12 @@ build {
execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}"
}
provisioner "shell" {
- script = "./scripts/build/delete-duplicate-sims.rb"
+ script = "./scripts/build/configure-xcode-simulators.rb"
execute_command = "source $HOME/.bash_profile; ruby {{ .Path }}"
}
provisioner "shell" {
inline = [
- "pwsh -File \"$HOME/image-generation/software-report/SoftwareReport.Generator.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName ${var.build_id}"
+ "pwsh -File \"$HOME/image-generation/software-report/Generate-SoftwareReport.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName ${var.build_id}"
]
execute_command = "source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}"
}
@@ -242,11 +242,15 @@ build {
direction = "download"
source = "./image-generation/output/"
}
+ provisioner "shell" {
+ inline = [
+ "rm -rf \"$(brew --cache)\""
+ ]
+ }
provisioner "shell" {
scripts = [
"./scripts/build/configure-hostname.sh",
- "./scripts/build/cleanup-brew.sh",
- "./scripts/build/finalize-vm.sh"
+ "./scripts/build/configure-system.sh"
]
execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}"
}
diff --git a/images/macos/templates/macOS-14.arm64.anka.pkr.hcl b/images/macos/templates/macOS-14.arm64.anka.pkr.hcl
index 0ca81152..0259f04e 100644
--- a/images/macos/templates/macOS-14.arm64.anka.pkr.hcl
+++ b/images/macos/templates/macOS-14.arm64.anka.pkr.hcl
@@ -130,18 +130,18 @@ build {
}
provisioner "shell" {
scripts = [
- "./scripts/build/xcode-clt.sh",
- "./scripts/build/homebrew.sh",
- "./scripts/build/rosetta.sh"
+ "./scripts/build/install-xcode-clt.sh",
+ "./scripts/build/install-homebrew.sh",
+ "./scripts/build/install-rosetta.sh"
]
execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}"
}
provisioner "shell" {
scripts = [
"./scripts/build/configure-tccdb-macos.sh",
- "./scripts/build/disable-auto-updates.sh",
- "./scripts/build/ntpconf.sh",
- "./scripts/build/shell-change.sh"
+ "./scripts/build/configure-auto-updates.sh",
+ "./scripts/build/configure-ntpconf.sh",
+ "./scripts/build/configure-shell.sh"
]
environment_vars = [
"PASSWORD=${var.vm_password}",
@@ -151,7 +151,7 @@ build {
}
provisioner "shell" {
scripts = [
- "./scripts/build/preimagedata.sh",
+ "./scripts/build/configure-preimagedata.sh",
"./scripts/build/configure-ssh.sh",
"./scripts/build/configure-machine.sh"
]
@@ -163,24 +163,24 @@ build {
execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}"
}
provisioner "shell" {
- script = "./scripts/build/reboot.sh"
- execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}"
+ execute_command = "source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}"
expect_disconnect = true
+ inline = ["echo 'Reboot VM'", "shutdown -r now"]
}
provisioner "shell" {
pause_before = "30s"
scripts = [
- "./scripts/build/open_windows_check.sh",
- "./scripts/build/powershell.sh",
- "./scripts/build/mono.sh",
- "./scripts/build/dotnet.sh",
- "./scripts/build/azcopy.sh",
- "./scripts/build/openssl.sh",
- "./scripts/build/ruby.sh",
- "./scripts/build/rubygem.sh",
- "./scripts/build/git.sh",
- "./scripts/build/node.sh",
- "./scripts/build/commonutils.sh"
+ "./scripts/build/configure-windows.sh",
+ "./scripts/build/install-powershell.sh",
+ "./scripts/build/install-mono.sh",
+ "./scripts/build/install-dotnet.sh",
+ "./scripts/build/install-azcopy.sh",
+ "./scripts/build/install-openssl.sh",
+ "./scripts/build/install-ruby.sh",
+ "./scripts/build/install-rubygems.sh",
+ "./scripts/build/install-git.sh",
+ "./scripts/build/install-node.sh",
+ "./scripts/build/install-common-utils.sh"
]
environment_vars = [
"API_PAT=${var.github_api_pat}",
@@ -189,7 +189,7 @@ build {
execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}"
}
provisioner "shell" {
- script = "./scripts/build/xcode.ps1"
+ script = "./scripts/build/Install-Xcode.ps1"
environment_vars = [
"XCODE_INSTALL_STORAGE_URL=${var.xcode_install_storage_url}",
"XCODE_INSTALL_SAS=${var.xcode_install_sas}"
@@ -197,24 +197,24 @@ build {
execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} pwsh -f {{ .Path }}"
}
provisioner "shell" {
- script = "./scripts/build/reboot.sh"
- execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}"
+ execute_command = "source $HOME/.bash_profile; sudo {{ .Vars }} {{ .Path }}"
expect_disconnect = true
+ inline = ["echo 'Reboot VM'", "shutdown -r now"]
}
provisioner "shell" {
scripts = [
- "./scripts/build/action-archive-cache.sh",
- "./scripts/build/llvm.sh",
- "./scripts/build/openjdk.sh",
- "./scripts/build/aws.sh",
- "./scripts/build/rust.sh",
- "./scripts/build/gcc.sh",
- "./scripts/build/cocoapods.sh",
- "./scripts/build/android-toolsets.sh",
- "./scripts/build/safari.sh",
- "./scripts/build/chrome.sh",
- "./scripts/build/bicep.sh",
- "./scripts/build/codeql-bundle.sh"
+ "./scripts/build/install-actions-cache.sh",
+ "./scripts/build/install-llvm.sh",
+ "./scripts/build/install-openjdk.sh",
+ "./scripts/build/install-aws-tools.sh",
+ "./scripts/build/install-rust.sh",
+ "./scripts/build/install-gcc.sh",
+ "./scripts/build/install-cocoapods.sh",
+ "./scripts/build/install-android-sdk.sh",
+ "./scripts/build/install-safari.sh",
+ "./scripts/build/install-chrome.sh",
+ "./scripts/build/install-bicep.sh",
+ "./scripts/build/install-codeql-bundle.sh"
]
environment_vars = [
"API_PAT=${var.github_api_pat}"
@@ -222,12 +222,12 @@ build {
execute_command = "chmod +x {{ .Path }}; source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}"
}
provisioner "shell" {
- script = "./scripts/build/delete-duplicate-sims.rb"
+ script = "./scripts/build/configure-xcode-simulators.rb"
execute_command = "source $HOME/.bash_profile; ruby {{ .Path }}"
}
provisioner "shell" {
inline = [
- "pwsh -File \"$HOME/image-generation/software-report/SoftwareReport.Generator.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName ${var.build_id}"
+ "pwsh -File \"$HOME/image-generation/software-report/Generate-SoftwareReport.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName ${var.build_id}"
]
execute_command = "source $HOME/.bash_profile; {{ .Vars }} {{ .Path }}"
}