whitequark.org
[mirror] Command-line application for uploading a site to a git-pages server
Fix `--verbose` output when used with `--path`.
+5
-7
main.go
+5
-7
main.go
···
81
81
}
82
82
switch {
83
83
case entry.Type().IsDir():
84
-
fmt.Fprintf(os.Stderr, "dir %s%s\n", prefix, name)
84
+
fmt.Fprintf(os.Stderr, "dir %s%s\n", prefix, name)
85
85
case entry.Type().IsRegular():
86
-
fmt.Fprintf(os.Stderr, "file %s%s\n", prefix, name)
86
+
fmt.Fprintf(os.Stderr, "file %s%s\n", prefix, name)
87
87
case entry.Type() == fs.ModeSymlink:
88
88
fmt.Fprintf(os.Stderr, "symlink %s%s\n", prefix, name)
89
89
default:
90
-
fmt.Fprintf(os.Stderr, "other %s%s\n", prefix, name)
90
+
fmt.Fprintf(os.Stderr, "other %s%s\n", prefix, name)
91
91
}
92
92
return nil
93
93
})
···
107
107
var tarName string
108
108
if prefix == "" && name == "." {
109
109
return nil
110
-
} else if prefix == "" {
111
-
tarName = name
112
110
} else if name == "." {
113
111
tarName = prefix
114
112
} else {
115
-
tarName = fmt.Sprintf("%s/%s", prefix, name)
113
+
tarName = prefix + name
116
114
}
117
115
var file io.ReadCloser
118
116
var linkTarget string
···
200
198
fmt.Fprintf(os.Stderr, "--path requires --upload-dir or --delete")
201
199
os.Exit(usageExitCode)
202
200
} else {
203
-
pathPrefix = strings.Trim(*pathFlag, "/")
201
+
pathPrefix = strings.Trim(*pathFlag, "/") + "/"
204
202
}
205
203
}
206
204