Skip to content

Commit 5bbbe66

Browse files
author
Cihangir
authored
Merge pull request koding#9302 from koding/fuse-vendor
vendor: update jacobsa/fuse
2 parents f50728e + 243b67a commit 5bbbe66

7 files changed

Lines changed: 145 additions & 76 deletions

File tree

‎go/src/glide.lock‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎go/src/koding/klientctl/build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ if [[ -z "$VERSION" ]]; then
3434
fi
3535

3636
kd_build() {
37-
go build -v -ldflags "-X koding/klientctl/config.Version=$VERSION -X koding/klientctl/config.SegmentKey=$KD_SEGMENTIO_KEY -X koding/klientctl/config.Environment=$CHANNEL" koding/klientctl
37+
go install -v -ldflags "-X koding/klientctl/config.Version=$VERSION -X koding/klientctl/config.SegmentKey=$KD_SEGMENTIO_KEY -X koding/klientctl/config.Environment=$CHANNEL" koding/klientctl
3838
mv "${REPO_PATH}/klientctl" "${REPO_PATH}/kd"
3939
}
4040

‎go/src/koding/klientctl/install-kd.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
readonly releaseChannel="%RELEASE_CHANNEL%"
44

5-
readonly OSXFUSE_URL="https://s3.amazonaws.com/koding-dl/osxfuse-2.8.0.dmg"
5+
readonly OSXFUSE_URL="https://s3.amazonaws.com/koding-dl/osxfuse-3.5.2.dmg"
66
readonly VIRTUALBOX_URL_LINUX="http://download.virtualbox.org/virtualbox/5.0.20/VirtualBox-5.0.20-106931-Linux_amd64.run"
77
readonly VIRTUALBOX_URL_DARWIN="http://download.virtualbox.org/virtualbox/5.0.20/VirtualBox-5.0.20-106931-OSX.dmg"
88
readonly VAGRANT_URL_LINUX="https://releases.hashicorp.com/vagrant/1.8.1/vagrant_1.8.1_x86_64.deb"
@@ -53,7 +53,7 @@ die() {
5353
}
5454

5555
install_fuse_darwin() {
56-
local fuseDir="/Library/Filesystems/osxfusefs.fs"
56+
local fuseDir="/Library/Filesystems/osxfuse.fs"
5757
local fuseDmg=/tmp/osxfuse.dmg
5858

5959
if [[ $PLATFORM == "linux" ]]; then
@@ -83,10 +83,10 @@ install_fuse_darwin() {
8383
sudo hdiutil attach $fuseDmg
8484

8585
# run the osxfuse installer
86-
sudo installer -pkg "/Volumes/FUSE for OS X/Install OSXFUSE 2.8.pkg" -target "/"
86+
sudo installer -pkg "/Volumes/FUSE for macOS/Extras/FUSE for macOS 3.5.2.pkg" -target "/"
8787

8888
# unmount dmg after it's finished
89-
diskutil unmount force "/Volumes/FUSE for OS X"
89+
diskutil unmount force "/Volumes/FUSE for macOS"
9090

9191
rm -f "$fuseDmg"
9292

‎go/src/vendor/github.com/jacobsa/fuse/fuseops/ops.go‎

Lines changed: 5 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎go/src/vendor/github.com/jacobsa/fuse/mount_darwin.go‎

Lines changed: 89 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎go/src/vendor/github.com/jacobsa/fuse/samples/flushfs/flush_fs_test.go‎

Lines changed: 3 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎go/src/vendor/github.com/jacobsa/fuse/samples/statfs/statfs_darwin_test.go‎

Lines changed: 42 additions & 30 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)