aniani/amfora
1
0
Fork 0
mirror of https://github.com/makew0rld/amfora.git synced 2024-09-29 23:15:59 -04:00
Code

Merge branch 'master' into cview-update

Browse Source
This commit is contained in:
makeworld 2020-10-29 14:32:19 -04:00
commit f5024068d0
3 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Updated [go-isemoji](https://github.com/makeworld-the-better-one/go-isemoji) to v1.1.0 to support Emoji 13.1 for favicons - Updated [go-isemoji](https://github.com/makeworld-the-better-one/go-isemoji) to v1.1.0 to support Emoji 13.1 for favicons
- The web browser code doesn't check for Xorg anymore, just display variables (#93) - The web browser code doesn't check for Xorg anymore, just display variables (#93)
- Bookmarks can be made to non-gemini URLs (#94) - Bookmarks can be made to non-gemini URLs (#94)
- Remove pointless directory fallbacks (#101)
### Fixed ### Fixed
- XDG user dir file is parsed instead of looking for XDG env vars (#97, #100) - XDG user dir file is parsed instead of looking for XDG env vars (#97, #100)

2
README.md
View File

@ -5,7 +5,7 @@
<h6>Image modified from: amphora by Alvaro Cabrera from the Noun Project</h6> <h6>Image modified from: amphora by Alvaro Cabrera from the Noun Project</h6>
</center> </center>
[![travis build status](https://img.shields.io/travis/com/makeworld-the-better-one/amfora)](https://https://travis-ci.com/github/makeworld-the-better-one/amfora) [![travis build status](https://img.shields.io/travis/com/makeworld-the-better-one/amfora/master?label=master)](https://travis-ci.com/github/makeworld-the-better-one/amfora)
[![go reportcard](https://goreportcard.com/badge/github.com/makeworld-the-better-one/amfora)](https://goreportcard.com/report/github.com/makeworld-the-better-one/amfora) [![go reportcard](https://goreportcard.com/badge/github.com/makeworld-the-better-one/amfora)](https://goreportcard.com/report/github.com/makeworld-the-better-one/amfora)
[![license GPLv3](https://img.shields.io/github/license/makeworld-the-better-one/amfora)](https://www.gnu.org/licenses/gpl-3.0.en.html) [![license GPLv3](https://img.shields.io/github/license/makeworld-the-better-one/amfora)](https://www.gnu.org/licenses/gpl-3.0.en.html)

21
config/config.go
View File

@ -62,12 +62,7 @@ func Init() error {
configDir = amforaAppData configDir = amforaAppData
} else { } else {
// Unix / POSIX system // Unix / POSIX system
if basedir.ConfigHome == "" { configDir = filepath.Join(basedir.ConfigHome, "amfora")
// Default to ~/.config/amfora
configDir = filepath.Join(home, ".config", "amfora")
} else {
configDir = filepath.Join(basedir.ConfigHome, "amfora")
}
} }
configPath = filepath.Join(configDir, "config.toml") configPath = filepath.Join(configDir, "config.toml")
@ -84,12 +79,7 @@ func Init() error {
tofuDBDir = amforaAppData tofuDBDir = amforaAppData
} else { } else {
// XDG cache dir on POSIX systems // XDG cache dir on POSIX systems
if basedir.CacheHome == "" { tofuDBDir = filepath.Join(basedir.CacheHome, "amfora")
// Default to ~/.cache/amfora
tofuDBDir = filepath.Join(home, ".cache", "amfora")
} else {
tofuDBDir = filepath.Join(basedir.CacheHome, "amfora")
}
} }
tofuDBPath = filepath.Join(tofuDBDir, "tofu.toml") tofuDBPath = filepath.Join(tofuDBDir, "tofu.toml")
@ -99,12 +89,7 @@ func Init() error {
bkmkDir = amforaAppData bkmkDir = amforaAppData
} else { } else {
// XDG data dir on POSIX systems // XDG data dir on POSIX systems
if basedir.DataHome == "" { bkmkDir = filepath.Join(basedir.DataHome, "amfora")
// Default to ~/.local/share/amfora
bkmkDir = filepath.Join(home, ".local", "share", "amfora")
} else {
bkmkDir = filepath.Join(basedir.DataHome, "amfora")
}
} }
bkmkPath = filepath.Join(bkmkDir, "bookmarks.toml") bkmkPath = filepath.Join(bkmkDir, "bookmarks.toml")