2
0
Эх сурвалжийг харах

Merge pull request #3881 from ThomasWaldmann/vagrant-fixes-1.0

Vagrant fixes (backport to 1.0)
TW 7 жил өмнө
parent
commit
b63a57faa6
1 өөрчлөгдсөн 4 нэмэгдсэн , 2 устгасан
  1. 4 2
      Vagrantfile

+ 4 - 2
Vagrantfile

@@ -60,11 +60,12 @@ 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
+    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
@@ -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