Commit f738f096 authored by Han-Wen Nienhuys's avatar Han-Wen Nienhuys

Fix zipfs package declaration.

parent bb7f8a9d
...@@ -2,7 +2,7 @@ package main ...@@ -2,7 +2,7 @@ package main
import ( import (
"github.com/hanwen/go-fuse/fuse" "github.com/hanwen/go-fuse/fuse"
zipfs "github.com/hanwen/go-fuse/zipfs" "github.com/hanwen/go-fuse/zipfs"
"fmt" "fmt"
"flag" "flag"
"log" "log"
......
...@@ -18,7 +18,7 @@ func main() { ...@@ -18,7 +18,7 @@ func main() {
flag.Parse() flag.Parse()
if len(flag.Args()) < 2 { if len(flag.Args()) < 2 {
fmt.Println("Usage:\n main MOUNTPOINT BASEDIR") fmt.Println("Usage:\n main MOUNTPOINT RW-DIRECTORY RO-DIRECTORY ...")
os.Exit(2) os.Exit(2)
} }
mountpoint := flag.Arg(0) mountpoint := flag.Arg(0)
...@@ -28,12 +28,9 @@ func main() { ...@@ -28,12 +28,9 @@ func main() {
BranchCacheTTLSecs: *branchcache_ttl, BranchCacheTTLSecs: *branchcache_ttl,
DeletionDirName: *deldirname, DeletionDirName: *deldirname,
} }
options := unionfs.AutoUnionFsOptions{
UnionFsOptions: ufsOptions,
}
gofs := unionfs.NewAutoUnionFs(flag.Arg(1), options) ufs := unionfs.NewUnionFs(flag.Args()[1:], ufsOptions)
conn := fuse.NewPathFileSystemConnector(gofs) conn := fuse.NewPathFileSystemConnector(ufs)
mountState := fuse.NewMountState(conn) mountState := fuse.NewMountState(conn)
mountState.Debug = *debug mountState.Debug = *debug
fmt.Printf("Mounting...\n") fmt.Printf("Mounting...\n")
......
...@@ -2,7 +2,7 @@ package main ...@@ -2,7 +2,7 @@ package main
import ( import (
"github.com/hanwen/go-fuse/fuse" "github.com/hanwen/go-fuse/fuse"
zipfs "github.com/hanwen/go-fuse/zipfs" "github.com/hanwen/go-fuse/zipfs"
"fmt" "fmt"
"flag" "flag"
"log" "log"
......
package examplelib package zipfs
/* /*
......
package examplelib package zipfs
import ( import (
"github.com/hanwen/go-fuse/fuse" "github.com/hanwen/go-fuse/fuse"
......
package examplelib package zipfs
import ( import (
"github.com/hanwen/go-fuse/fuse" "github.com/hanwen/go-fuse/fuse"
......
package examplelib package zipfs
import ( import (
"github.com/hanwen/go-fuse/fuse" "github.com/hanwen/go-fuse/fuse"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment