From f4367d66d89cdca9ab1aae571648981e413d09a8 Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Wed, 3 Jul 2024 13:57:56 +0200
Subject: [PATCH] vagrant: darwin -> macos

Also: add macOS version number.
---
 Vagrantfile            | 20 ++++++++++----------
 scripts/fetch-binaries |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index c02660666..d9c1ceee2 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -106,7 +106,7 @@ def packages_netbsd
   EOF
 end
 
-def packages_darwin
+def packages_macos
   return <<-EOF
     # install all the (security and other) updates
     sudo softwareupdate --ignore iTunesX
@@ -155,7 +155,7 @@ def install_pyenv(boxname)
   EOF
 end
 
-def fix_pyenv_darwin(boxname)
+def fix_pyenv_macos(boxname)
   return <<-EOF
     echo 'export PYTHON_CONFIGURE_OPTS="--enable-framework"' >> ~/.bash_profile
   EOF
@@ -389,7 +389,7 @@ Vagrant.configure(2) do |config|
     b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("netbsd", ".*fuse.*")
   end
 
-  config.vm.define "darwin" do |b|
+  config.vm.define "macos1012" do |b|
     b.vm.box = "macos-sierra"
     b.vm.provider :virtualbox do |v|
       v.memory = 4096 + $wmem
@@ -404,15 +404,15 @@ Vagrant.configure(2) do |config|
       v.customize ["modifyvm", :id, '--usbehci', 'off', '--usbxhci', 'off']
     end
     b.vm.provision "fs init", :type => :shell, :inline => fs_init("vagrant")
-    b.vm.provision "packages darwin", :type => :shell, :privileged => false, :inline => packages_darwin
-    b.vm.provision "install pyenv", :type => :shell, :privileged => false, :inline => install_pyenv("darwin")
-    b.vm.provision "fix pyenv", :type => :shell, :privileged => false, :inline => fix_pyenv_darwin("darwin")
-    b.vm.provision "install pythons", :type => :shell, :privileged => false, :inline => install_pythons("darwin")
-    b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_pyenv_venv("darwin")
+    b.vm.provision "packages macos", :type => :shell, :privileged => false, :inline => packages_macos
+    b.vm.provision "install pyenv", :type => :shell, :privileged => false, :inline => install_pyenv("macos")
+    b.vm.provision "fix pyenv", :type => :shell, :privileged => false, :inline => fix_pyenv_macos("macos")
+    b.vm.provision "install pythons", :type => :shell, :privileged => false, :inline => install_pythons("macos")
+    b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_pyenv_venv("macos")
     b.vm.provision "install borg", :type => :shell, :privileged => false, :inline => install_borg("llfuse")
     b.vm.provision "install pyinstaller", :type => :shell, :privileged => false, :inline => install_pyinstaller()
-    b.vm.provision "build binary with pyinstaller", :type => :shell, :privileged => false, :inline => build_binary_with_pyinstaller("darwin")
-    b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("darwin", ".*(fuse3|none).*")
+    b.vm.provision "build binary with pyinstaller", :type => :shell, :privileged => false, :inline => build_binary_with_pyinstaller("macos")
+    b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("macos", ".*(fuse3|none).*")
   end
 
   # rsync on openindiana has troubles, does not set correct owner for /vagrant/borg and thus gives lots of
diff --git a/scripts/fetch-binaries b/scripts/fetch-binaries
index 5f502f898..ef720c38e 100755
--- a/scripts/fetch-binaries
+++ b/scripts/fetch-binaries
@@ -19,4 +19,4 @@ check_and_copy bookworm  borg-linux-glibc236
 check_and_copy freebsd13 borg-freebsd13
 check_and_copy freebsd14 borg-freebsd14
 
-check_and_copy darwin    borg-macos
+check_and_copy macos1012 borg-macos1012