linting

Signed-off-by: Corey Hemminger <[email protected]>

.github/workflows/pkr-bld-parallels-arm64.yml

@@ -20,8 +20,8 @@ jobs:
           - centos-stream-9
           - debian-11
           - debian-12
-          - fedora-38
           - fedora-39
+          - fedora-40
           - freebsd-13
           - freebsd-14
           - opensuse-leap-15

.github/workflows/pkr-bld-parallels-x64.yml

@@ -20,8 +20,8 @@ jobs:
           - centos-stream-9
           - debian-11
           - debian-12
-          - fedora-38
           - fedora-39
+          - fedora-40
           - freebsd-13
           - freebsd-14
           - opensuse-leap-15

.github/workflows/pkr-bld-qemu-arm64.yml

@@ -20,8 +20,8 @@ jobs:
           - centos-stream-9
           - debian-11
           - debian-12
-          - fedora-38
           - fedora-39
+          - fedora-40
           - freebsd-13
           - freebsd-14
           - opensuse-leap-15

.github/workflows/pkr-bld-qemu-x64.yml

@@ -20,8 +20,8 @@ jobs:
           - centos-stream-9
           - debian-11
           - debian-12
-          - fedora-38
           - fedora-39
+          - fedora-40
           - freebsd-13
           - freebsd-14
           - opensuse-leap-15

.github/workflows/pkr-bld-virtualbox-arm64.yml

@@ -20,8 +20,8 @@ jobs:
           - centos-stream-9
           - debian-11
           - debian-12
-          - fedora-38
           - fedora-39
+          - fedora-40
           - freebsd-13
           - freebsd-14
           - opensuse-leap-15

.github/workflows/pkr-bld-virtualbox-x64.yml

@@ -20,8 +20,8 @@ jobs:
           - centos-stream-9
           - debian-11
           - debian-12
-          - fedora-38
           - fedora-39
+          - fedora-40
           - freebsd-13
           - freebsd-14
           - opensuse-leap-15

.github/workflows/pkr-bld-vmware-arm64.yml

@@ -20,8 +20,8 @@ jobs:
           - centos-stream-9
           - debian-11
           - debian-12
-          - fedora-38
           - fedora-39
+          - fedora-40
           - freebsd-13
           - freebsd-14
           - opensuse-leap-15

.github/workflows/pkr-bld-vmware-x64.yml

@@ -20,8 +20,8 @@ jobs:
           - centos-stream-9
           - debian-11
           - debian-12
-          - fedora-38
           - fedora-39
+          - fedora-40
           - freebsd-13
           - freebsd-14
           - opensuse-leap-15

CHANGELOG.md

@@ -16,8 +16,8 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#>
 | centos-stream-9 |  | x |  |  |  | x |  | x | x |
 | debian-11 |  | x | x |  |  | x |  | x |  |
 | debian-12 |  | x | x |  |  | x |  | x | x |
-| fedora-38 |  | x | x |  |  | x |  | x | x |
 | fedora-39 |  | x | x |  |  | x |  | x | x |
+| fedora-40 |  |  |  |  |  |  |  |  |  |
 | freebsd-13 |  |  |  |  |  | x |  | x | x |
 | freebsd-14 |  |  |  |  |  |  |  |  |  |
 | macos |  |  | x |  |  |  |  |  |  |
@@ -54,9 +54,9 @@ Markdown table generated at <https://www.tablesgenerator.com/markdown_tables#>
 - Create CD pipeline to upload vagrant boxes after PR is merged
 - Create CD pipeline to build and upload new versions of vagrant boxes once every 3 months with the latest patches
 
-## [unreleased] (2024-04-23)
+## [unreleased] (2024-04-24)
 
-## [v4.1.1] (2024-04-23)
+## [v4.1.1] (2024-04-24)
 
 - Require ruby >= 3.0.0
 - Add parallels-ipsw source

builds.yml

@@ -15,8 +15,8 @@ public:
   - centos-stream-9
   - debian-11
   - debian-12
-  - fedora-38
   - fedora-39
+  - fedora-40
   - freebsd-13
   - freebsd-14
   - opensuse-leap-15

packer_templates/pkr-variables.pkr.hcl

@@ -101,7 +101,6 @@ variable "http_content" {
   description = "Content to be served by the http server"
 }
 
-
 # parallels-iso
 variable "parallels_boot_wait" {
   type    = string

packer_templates/scripts/macos/parallels-tools.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-if [ -e .PACKER_BUILDER_TYPE ] || [[ "$PACKER_BUILDER_TYPE" == parallels* ]]; then
+if [ -e .PACKER_BUILDER_TYPE ] || echo "$PACKER_BUILDER_TYPE" | grep -q '^parallels'; then
     echo "Installing Parallels Tools..."
     installer -pkg /Volumes/Parallels\ Tools/Install.app/Contents/Resources/Install.mpkg -target /
 

packer_templates/scripts/macos/shrink.sh

@@ -14,13 +14,16 @@
 # 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.
 
+echo 'Disable spotlight...'
+mdutil -a -i off
+
 echo 'Turn off hibernation and get rid of the sleepimage'
 pmset hibernatemode 0
 rm -f /var/vm/sleepimage
 
 echo 'Stop the pager process and drop swap files. These will be re-created on boot.'
 # Starting with El Cap we can only stop the dynamic pager if SIP is disabled.
-if $(csrutil status | grep -q disabled); then
+if csrutil status | grep -q disabled; then
   launchctl unload /System/Library/LaunchDaemons/com.apple.dynamic_pager.plist
   sleep 5
 fi

packer_templates/scripts/macos/system-default.sh

@@ -30,6 +30,3 @@ sysadminctl -autologin set -userName vagrant -password vagrant
 
 echo 'Disable screen lock'
 sysadminctl -screenLock off -password vagrant
-
-echo 'Disable spotlight...'
-mdutil -a -i off

packer_templates/scripts/macos/vagrant.sh

@@ -19,8 +19,8 @@ OSX_VERS=$(sw_vers -productVersion | awk -F "." '{print $1}')
 
 # Set computer/hostname
 COMPNAME=macos-${OSX_VERS}
-scutil --set ComputerName ${COMPNAME}
-scutil --set HostName ${COMPNAME}.vagrantup.com
+scutil --set ComputerName "${COMPNAME}"
+scutil --set HostName "${COMPNAME}".vagrantup.com
 
 echo "Installing vagrant keys for vagrant user"
 mkdir "/Users/vagrant/.ssh"

packer_templates/scripts/macos/vmware-tools.sh

@@ -15,7 +15,7 @@
 # OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 echo 'VMware Fusion specific items'
-if [ -e .vmfusion_version ] || [[ "$PACKER_BUILDER_TYPE" == vmware* ]]; then
+if [ -e .vmfusion_version ] || echo "$PACKER_BUILDER_TYPE" | grep -q '^vmware'; then
   # Globbing here: VMware Fusion >= 8.5.4 includes a second
   # 'darwinPre15.iso' for any OS X guests pre-10.11
   TOOLS_PATH=$(find "/Users/vagrant/" -name '*darwin*.iso' -print)
@@ -24,7 +24,7 @@ if [ -e .vmfusion_version ] || [[ "$PACKER_BUILDER_TYPE" == vmware* ]]; then
         exit 1
     fi
 
-    TMPMOUNT=`/usr/bin/mktemp -d /tmp/vmware-tools.XXXX`
+    TMPMOUNT=$(/usr/bin/mktemp -d /tmp/vmware-tools.XXXX)
     hdiutil attach "$TOOLS_PATH" -mountpoint "$TMPMOUNT"
 
     INSTALLER_PKG="$TMPMOUNT/Install VMware Tools.app/Contents/Resources/VMware Tools.pkg"