Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replaced 3 calls to go-utils/ufs with metaleap/go-util #272

Merged
merged 2 commits into from
Apr 5, 2018
Merged

Replaced 3 calls to go-utils/ufs with metaleap/go-util #272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1ef96e
replaced the 3 calls to go-utils/ufs with metaleap/go-util .. only di…
tobybot11 Jan 28, 2018
9162c3f
updated after running go fmt on tools/fs/fs.og
tobybot11 Jan 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 50 additions & 25 deletions Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

[[constraint]]
branch = "master"
name = "github.com/go-utils/ufs"
name = "github.com/metaleap/go-util"

[[constraint]]
name = "github.com/onsi/ginkgo"
Expand Down
8 changes: 4 additions & 4 deletions tools/fs/fs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"log"
"os"

"github.com/go-utils/ufs"
metaleapfs "github.com/metaleap/go-util/fs"
)

// Util is an interface for helper file system utilities.
Expand Down Expand Up @@ -37,13 +37,13 @@ func (fs OSUtil) OpenAndReadFile(file string) ([]byte, error) {

// CopyAll copies recursively from source to destination
func (fs OSUtil) CopyAll(source string, destination string) error {
return ufs.CopyAll(source, destination, nil)
return metaleapfs.CopyAll(source, destination, nil, "")
}

// Copy copies one file from source to destination
func (fs OSUtil) Copy(source string, destination string) error {
log.Printf("source %s dest %s\n", source, destination)
return ufs.CopyFile(source, destination)
return metaleapfs.CopyFile(source, destination)
}

// TempDir creates a temp directory that the user is responsible for cleaning up
Expand All @@ -53,7 +53,7 @@ func (fs OSUtil) TempDir(dir string, prefix string) (string, error) {

// Mkdirs ensures that the directory is created.
func (fs OSUtil) Mkdirs(dir string) error {
return ufs.EnsureDirExists(dir)
return metaleapfs.EnsureDirExists(dir)
}

// AppendOrCreate adds text to file if it exists otherwise it creates a new
Expand Down