Browse Source

Adapt code to new basedir

pull/8/head
Daniel Martí 11 years ago
parent
commit
184affd7d5
  1. 16
      cmd/fdroidcl/main.go
  2. 2
      cmd/fdroidcl/update.go

16
cmd/fdroidcl/main.go

@ -28,23 +28,23 @@ func subdir(dir, name string) string {
} }
func mustCache() string { func mustCache() string {
dir, err := basedir.Cache() dir := basedir.Cache()
if err != nil { if dir == "" {
log.Fatalf("Could not determine cache dir: %v", err) log.Fatalf("Could not determine cache dir")
} }
return subdir(dir, cmdName) return subdir(dir, cmdName)
} }
func mustConfig() string { func mustData() string {
dir, err := basedir.Config() dir := basedir.Data()
if err != nil { if dir == "" {
log.Fatalf("Could not determine config dir: %v", err) log.Fatalf("Could not determine data dir")
} }
return subdir(dir, cmdName) return subdir(dir, cmdName)
} }
func configPath() string { func configPath() string {
return filepath.Join(mustConfig(), "config.json") return filepath.Join(mustData(), "config.json")
} }
type repo struct { type repo struct {

2
cmd/fdroidcl/update.go

@ -128,7 +128,7 @@ func downloadEtag(url, path string, sum []byte) error {
} }
func indexPath(name string) string { func indexPath(name string) string {
return filepath.Join(mustConfig(), name+".jar") return filepath.Join(mustData(), name+".jar")
} }
func mustLoadIndexes() []fdroidcl.App { func mustLoadIndexes() []fdroidcl.App {

Loading…
Cancel
Save