mirror of
https://github.com/borgbackup/borg.git
synced 2025-02-23 14:41:43 +00:00
Merge pull request #3872 from ThomasWaldmann/vagrant-fixes
Vagrant fixes / updates
This commit is contained in:
commit
797a90797e
1 changed files with 4 additions and 2 deletions
6
Vagrantfile
vendored
6
Vagrantfile
vendored
|
@ -60,11 +60,12 @@ def packages_darwin
|
||||||
# install all the (security and other) updates
|
# install all the (security and other) updates
|
||||||
sudo softwareupdate --ignore iTunesX
|
sudo softwareupdate --ignore iTunesX
|
||||||
sudo softwareupdate --ignore iTunes
|
sudo softwareupdate --ignore iTunes
|
||||||
|
sudo softwareupdate --ignore "macOS High Sierra"
|
||||||
sudo softwareupdate --install --all
|
sudo softwareupdate --install --all
|
||||||
# get osxfuse 3.x release code from github:
|
# 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) \
|
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
|
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)"
|
ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
|
||||||
brew update
|
brew update
|
||||||
|
@ -330,6 +331,7 @@ def fs_init(user)
|
||||||
return <<-EOF
|
return <<-EOF
|
||||||
# clean up (wrong/outdated) stuff we likely got via rsync:
|
# clean up (wrong/outdated) stuff we likely got via rsync:
|
||||||
rm -rf /vagrant/borg/borg/.tox 2> /dev/null
|
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
|
rm -rf /vagrant/borg/borg/__pycache__ 2> /dev/null
|
||||||
find /vagrant/borg/borg/src -name '__pycache__' -exec rm -rf {} \\; 2> /dev/null
|
find /vagrant/borg/borg/src -name '__pycache__' -exec rm -rf {} \\; 2> /dev/null
|
||||||
chown -R #{user} /vagrant/borg
|
chown -R #{user} /vagrant/borg
|
||||||
|
|
Loading…
Reference in a new issue