From 85056def909c994b66c40763f6d6c2d41c7a61d0 Mon Sep 17 00:00:00 2001 From: Jakob Unterwurzacher Date: Sun, 1 Apr 2018 12:31:44 +0200 Subject: main: move and rename checkDir*() helper To avoid confusion with fsck, rename to isDir*() and move the functions into init_dir.go. --- mount.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mount.go') diff --git a/mount.go b/mount.go index 96ff7f6..c5b1c05 100644 --- a/mount.go +++ b/mount.go @@ -58,9 +58,9 @@ func doMount(args *argContainer) { os.Exit(exitcodes.MountPoint) } if args.nonempty { - err = checkDir(args.mountpoint) + err = isDir(args.mountpoint) } else { - err = checkDirEmpty(args.mountpoint) + err = isDirEmpty(args.mountpoint) // OSXFuse will create the mountpoint for us ( https://github.com/rfjakob/gocryptfs/issues/194 ) if runtime.GOOS == "darwin" && os.IsNotExist(err) { tlog.Info.Printf("Mountpoint %q does not exist, but should be created by OSXFuse", -- cgit v1.2.3