github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-21 20:46:30 -05:00
Code Issues Projects Releases Packages Wiki Activity

converted path 2 filepath

Browse source
This commit is contained in:
Joel Scoble 2014-11-06 10:56:14 -06:00 committed by spf13
parent 2c51bba0c3
commit 99463f6adf
3 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
commands/convert.go
View file

@ -15,7 +15,7 @@ package commands
import (
"fmt"
"path"
"path/filepath"
"time"
"github.com/spf13/cast"
@ -133,7 +133,7 @@ func convertContents(mark rune) (err error) {
page.SetSourceMetaData(metadata, mark)
if OutputDir != "" {
page.SaveSourceAs(path.Join(OutputDir, page.FullFilePath()))
page.SaveSourceAs(filepath.Join(OutputDir, page.FullFilePath()))
} else {
if Unsafe {
page.SaveSource()

13
commands/new.go
View file

@ -14,7 +14,6 @@ package commands
import (
"bytes"
"os"
"path"
"path/filepath"
"strings"
@ -141,7 +140,7 @@ func NewTheme(cmd *cobra.Command, args []string) {
jww.FATAL.Fatalln("theme name needs to be provided")
}
createpath := helpers.AbsPathify(path.Join("themes", args[0]))
createpath := helpers.AbsPathify(filepath.Join("themes", args[0]))
jww.INFO.Println("creating theme at", createpath)
if x, _ := helpers.Exists(createpath, hugofs.SourceFs); x {
@ -186,7 +185,7 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
`)
err := helpers.WriteToDisk(path.Join(createpath, "LICENSE.md"), bytes.NewReader(by), hugofs.SourceFs)
err := helpers.WriteToDisk(filepath.Join(createpath, "LICENSE.md"), bytes.NewReader(by), hugofs.SourceFs)
if err != nil {
jww.FATAL.Fatalln(err)
}
@ -195,7 +194,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
}
func mkdir(x ...string) {
p := path.Join(x...)
p := filepath.Join(x...)
err := os.MkdirAll(p, 0777) // rwx, rw, r
if err != nil {
@ -204,7 +203,7 @@ func mkdir(x ...string) {
}
func touchFile(x ...string) {
inpath := path.Join(x...)
inpath := filepath.Join(x...)
mkdir(filepath.Dir(inpath))
err := helpers.WriteToDisk(inpath, bytes.NewReader([]byte{}), hugofs.SourceFs)
if err != nil {
@ -228,7 +227,7 @@ func createThemeMD(inpath string) (err error) {
return err
}
err = helpers.WriteToDisk(path.Join(inpath, "theme.toml"), bytes.NewReader(by), hugofs.SourceFs)
err = helpers.WriteToDisk(filepath.Join(inpath, "theme.toml"), bytes.NewReader(by), hugofs.SourceFs)
if err != nil {
return
}
@ -245,7 +244,7 @@ func createConfig(inpath string, kind string) (err error) {
return err
}
err = helpers.WriteToDisk(path.Join(inpath, "config."+kind), bytes.NewReader(by), hugofs.SourceFs)
err = helpers.WriteToDisk(filepath.Join(inpath, "config."+kind), bytes.NewReader(by), hugofs.SourceFs)
if err != nil {
return
}

3
commands/version.go
View file

@ -16,7 +16,6 @@ package commands
import (
"fmt"
"os"
"path"
"path/filepath"
"strings"
"time"
@ -65,7 +64,7 @@ func setBuildDate() {
fmt.Println(err)
return
}
fi, err := os.Lstat(path.Join(dir, "hugo"))
fi, err := os.Lstat(filepath.Join(dir, "hugo"))
if err != nil {
fmt.Println(err)
return