summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Waldmann <tw@waldmann-edv.de>2018-06-02 21:26:11 +0200
committerThomas Waldmann <tw@waldmann-edv.de>2018-06-08 08:54:45 +0200
commit4308632040b7fcfdca942da8882a90eb8dc7012e (patch)
tree46b21ff6c399bb756a693937d660d122665b93ad
parent564e4e924472dc7d199640af81e06d8f615cce9a (diff)
Vagrantfile fixes
remove borgbackup.egg-info dir in fs_init (after rsync) exclude macOS High Sierra upgrade on the darwin64 machine (cherry picked from commit 6f3a106b5ee5371337ba2b1441716dd5d5796593)
-rw-r--r--Vagrantfile2
1 files changed, 2 insertions, 0 deletions
diff --git a/Vagrantfile b/Vagrantfile
index 07908e131..1e88115ea 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 "Install 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
@@ -319,6 +320,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/borg -name '__pycache__' -exec rm -rf {} \\; 2> /dev/null
chown -R #{user} /vagrant/borg