summaryrefslogtreecommitdiff
path: root/predict_files.go
diff options
context:
space:
mode:
authorEyal Posener <[email protected]>2017-05-13 22:44:36 +0300
committerEyal Posener <[email protected]>2017-05-13 22:44:36 +0300
commita32482e70da76715645de14fa0a6201eace3df53 (patch)
treeb4d012d2f5714c479d54e9df3738508237add7c0 /predict_files.go
parentc7377ba2de5df7097776c07f1ca68ca0fc8ee90e (diff)
test: add args tests
Diffstat (limited to 'predict_files.go')
-rw-r--r--predict_files.go26
1 files changed, 1 insertions, 25 deletions
diff --git a/predict_files.go b/predict_files.go
index 5f83e77..af26e81 100644
--- a/predict_files.go
+++ b/predict_files.go
@@ -78,7 +78,7 @@ func PredictFilesSet(files []string) PredictFunc {
for _, f := range files {
// change file name to relative if necessary
if rel {
- f = toRel(f)
+ f = relativePath(f)
}
// test matching of file to the argument
@@ -119,27 +119,3 @@ func listFiles(dir, pattern string, allowFiles bool) []string {
return list
}
-// toRel changes a file name to a relative name
-func toRel(file string) string {
- // get wording directory for relative name
- workDir, err := os.Getwd()
- if err != nil {
- return file
- }
-
- abs, err := filepath.Abs(file)
- if err != nil {
- return file
- }
- rel, err := filepath.Rel(workDir, abs)
- if err != nil {
- return file
- }
- if rel != "." {
- rel = "./" + rel
- }
- if info, err := os.Stat(rel); err == nil && info.IsDir() {
- rel += "/"
- }
- return rel
-}