From 6f3a106b5ee5371337ba2b1441716dd5d5796593 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sat, 2 Jun 2018 21:26:11 +0200 Subject: [PATCH 1/2] Vagrantfile fixes remove borgbackup.egg-info dir in fs_init (after rsync) exclude macOS High Sierra upgrade on the darwin64 machine --- Vagrantfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Vagrantfile b/Vagrantfile index b795630b7..1356b0987 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -60,6 +60,7 @@ def packages_darwin # install all the (security and other) updates sudo softwareupdate --ignore iTunesX sudo softwareupdate --ignore iTunes + sudo softwareupdate --ignore "macOS High Sierra" sudo softwareupdate --install --all # get osxfuse 3.x release code from github: curl -s -L https://github.com/osxfuse/osxfuse/releases/download/osxfuse-3.7.1/osxfuse-3.7.1.dmg >osxfuse.dmg @@ -330,6 +331,7 @@ def fs_init(user) return <<-EOF # clean up (wrong/outdated) stuff we likely got via rsync: rm -rf /vagrant/borg/borg/.tox 2> /dev/null + rm -rf /vagrant/borg/borg/borgbackup.egg-info 2> /dev/null rm -rf /vagrant/borg/borg/__pycache__ 2> /dev/null find /vagrant/borg/borg/src -name '__pycache__' -exec rm -rf {} \\; 2> /dev/null chown -R #{user} /vagrant/borg From c3d231534840533c49e277302676483833c8602c Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sat, 2 Jun 2018 21:27:44 +0200 Subject: [PATCH 2/2] FUSE for macOS: upgrade 3.7.1 to 3.8.0 --- Vagrantfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 1356b0987..d8dc59d66 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -63,9 +63,9 @@ def packages_darwin sudo softwareupdate --ignore "macOS High Sierra" sudo softwareupdate --install --all # get osxfuse 3.x release code from github: - curl -s -L https://github.com/osxfuse/osxfuse/releases/download/osxfuse-3.7.1/osxfuse-3.7.1.dmg >osxfuse.dmg + curl -s -L https://github.com/osxfuse/osxfuse/releases/download/osxfuse-3.8.0/osxfuse-3.8.0.dmg >osxfuse.dmg MOUNTDIR=$(echo `hdiutil mount osxfuse.dmg | tail -1 | awk '{$1="" ; print $0}'` | xargs -0 echo) \ - && sudo installer -pkg "${MOUNTDIR}/Extras/FUSE for macOS 3.7.1.pkg" -target / + && sudo installer -pkg "${MOUNTDIR}/Extras/FUSE for macOS 3.8.0.pkg" -target / sudo chown -R vagrant /usr/local # brew must be able to create stuff here ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" brew update