alex/homemaker
1
Fork 0
Code Releases 1 Activity

Merge pull request #34 from albertdev/bugfix/use-filepath-package

Browse Source 
Use filepath package throughout for Windows support
This commit is contained in:
Alex Yatskov 2021-12-14 15:07:59 -08:00 committed by GitHub
commit 0a90c2e21c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config.go
View File

@ -26,7 +26,7 @@ import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"path" "path/filepath"
"github.com/naoina/toml" "github.com/naoina/toml"
"gopkg.in/yaml.v2" "gopkg.in/yaml.v2"
@ -50,7 +50,7 @@ func newConfig(filename string) (*config, error) {
} }
conf := &config{handled: make(map[string]bool)} conf := &config{handled: make(map[string]bool)}
switch path.Ext(filename) { switch filepath.Ext(filename) {
case ".json": case ".json":
if err := json.Unmarshal(bytes, &conf); err != nil { if err := json.Unmarshal(bytes, &conf); err != nil {
return nil, err return nil, err

4
homemaker.go
View File

@ -27,7 +27,7 @@ import (
"fmt" "fmt"
"log" "log"
"os" "os"
"path" "path/filepath"
"strings" "strings"
) )
@ -43,7 +43,7 @@ const (
) )
func usage() { func usage() {
fmt.Fprintf(os.Stderr, "Usage: %s [options] conf src\n", path.Base(os.Args[0])) fmt.Fprintf(os.Stderr, "Usage: %s [options] conf src\n", filepath.Base(os.Args[0]))
fmt.Fprintf(os.Stderr, "https://foosoft.net/projects/homemaker/\n\n") fmt.Fprintf(os.Stderr, "https://foosoft.net/projects/homemaker/\n\n")
fmt.Fprintf(os.Stderr, "Parameters:\n") fmt.Fprintf(os.Stderr, "Parameters:\n")
flag.PrintDefaults() flag.PrintDefaults()

10
link.go
View File

@ -26,7 +26,7 @@ import (
"fmt" "fmt"
"log" "log"
"os" "os"
"path" "path/filepath"
"strconv" "strconv"
) )
@ -65,13 +65,13 @@ func processLink(params []string, conf *config) error {
} }
srcPathAbs := srcPath srcPathAbs := srcPath
if !path.IsAbs(srcPathAbs) { if !filepath.IsAbs(srcPathAbs) {
srcPathAbs = path.Join(conf.srcDir, srcPath) srcPathAbs = filepath.Join(conf.srcDir, srcPath)
} }
dstPathAbs := dstPath dstPathAbs := dstPath
if !path.IsAbs(dstPathAbs) { if !filepath.IsAbs(dstPathAbs) {
dstPathAbs = path.Join(conf.dstDir, dstPath) dstPathAbs = filepath.Join(conf.dstDir, dstPath)
} }
if conf.flags&flagUnlink != flagUnlink { if conf.flags&flagUnlink != flagUnlink {

10
template.go
View File

@ -26,7 +26,7 @@ import (
"fmt" "fmt"
"log" "log"
"os" "os"
"path" "path/filepath"
"strconv" "strconv"
"strings" "strings"
"text/template" "text/template"
@ -79,13 +79,13 @@ func processTemplate(params []string, conf *config) (err error) {
} }
srcPathAbs := srcPath srcPathAbs := srcPath
if !path.IsAbs(srcPathAbs) { if !filepath.IsAbs(srcPathAbs) {
srcPathAbs = path.Join(conf.srcDir, srcPath) srcPathAbs = filepath.Join(conf.srcDir, srcPath)
} }
dstPathAbs := dstPath dstPathAbs := dstPath
if !path.IsAbs(dstPathAbs) { if !filepath.IsAbs(dstPathAbs) {
dstPathAbs = path.Join(conf.dstDir, dstPath) dstPathAbs = filepath.Join(conf.dstDir, dstPath)
} }
if _, err = os.Stat(srcPathAbs); os.IsNotExist(err) { if _, err = os.Stat(srcPathAbs); os.IsNotExist(err) {

3
util.go
View File

@ -26,7 +26,6 @@ import (
"fmt" "fmt"
"log" "log"
"os" "os"
"path"
"path/filepath" "path/filepath"
"strings" "strings"
) )
@ -78,7 +77,7 @@ func cleanPath(loc string, flags int) (bool, error) {
} }
func createPath(loc string, flags int, mode os.FileMode) error { func createPath(loc string, flags int, mode os.FileMode) error {
parentDir := path.Dir(loc) parentDir := filepath.Dir(loc)
if _, err := os.Stat(parentDir); os.IsNotExist(err) { if _, err := os.Stat(parentDir); os.IsNotExist(err) {
if flags&flagForce != 0 || prompt("force create path", parentDir) { if flags&flagForce != 0 || prompt("force create path", parentDir) {