diff --git a/.travis.yml b/.travis.yml index 0777c49e..b3ba35f5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ dist: trusty matrix: include: - os: osx - osx_image: xcode9.4 + osx_image: xcode10.1 script: - ./test.sh diff --git a/macosx/up.sh b/macosx/up.sh index f90f632a..0bd94a6c 100755 --- a/macosx/up.sh +++ b/macosx/up.sh @@ -92,14 +92,19 @@ brew cask install adium brew cask install kdiff3 brew cask install istat-menus +echo "finsihed installing" + +echo "restart syncthing" reattach-to-user-namespace brew services restart syncthing if ! fgrep /usr/local/bin/zsh /etc/shells; then + echo "add shell" sudo bash -c "echo /usr/local/bin/zsh >> /etc/shells" fi +echo "cleanup" brew cleanup -brew prune + set +e mv "$HOME/.cargo/bin/cargo-install-update-config" "$HOME/.cargo/bin/cargo-install-update-cfg" set -e