mirror of
https://github.com/makew0rld/amfora.git
synced 2024-09-29 23:15:59 -04:00
Merge branch 'master' into cview-update
This commit is contained in:
commit
f5024068d0
@ -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)
|
||||||
|
@ -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)
|
||||||
|
|
||||||
|
@ -62,13 +62,8 @@ func Init() error {
|
|||||||
configDir = amforaAppData
|
configDir = amforaAppData
|
||||||
} else {
|
} else {
|
||||||
// Unix / POSIX system
|
// Unix / POSIX system
|
||||||
if basedir.ConfigHome == "" {
|
|
||||||
// Default to ~/.config/amfora
|
|
||||||
configDir = filepath.Join(home, ".config", "amfora")
|
|
||||||
} else {
|
|
||||||
configDir = filepath.Join(basedir.ConfigHome, "amfora")
|
configDir = filepath.Join(basedir.ConfigHome, "amfora")
|
||||||
}
|
}
|
||||||
}
|
|
||||||
configPath = filepath.Join(configDir, "config.toml")
|
configPath = filepath.Join(configDir, "config.toml")
|
||||||
|
|
||||||
// Search for a custom new tab
|
// Search for a custom new tab
|
||||||
@ -84,13 +79,8 @@ func Init() error {
|
|||||||
tofuDBDir = amforaAppData
|
tofuDBDir = amforaAppData
|
||||||
} else {
|
} else {
|
||||||
// XDG cache dir on POSIX systems
|
// XDG cache dir on POSIX systems
|
||||||
if basedir.CacheHome == "" {
|
|
||||||
// Default to ~/.cache/amfora
|
|
||||||
tofuDBDir = filepath.Join(home, ".cache", "amfora")
|
|
||||||
} else {
|
|
||||||
tofuDBDir = filepath.Join(basedir.CacheHome, "amfora")
|
tofuDBDir = filepath.Join(basedir.CacheHome, "amfora")
|
||||||
}
|
}
|
||||||
}
|
|
||||||
tofuDBPath = filepath.Join(tofuDBDir, "tofu.toml")
|
tofuDBPath = filepath.Join(tofuDBDir, "tofu.toml")
|
||||||
|
|
||||||
// Store bookmarks dir and path
|
// Store bookmarks dir and path
|
||||||
@ -99,13 +89,8 @@ func Init() error {
|
|||||||
bkmkDir = amforaAppData
|
bkmkDir = amforaAppData
|
||||||
} else {
|
} else {
|
||||||
// XDG data dir on POSIX systems
|
// XDG data dir on POSIX systems
|
||||||
if basedir.DataHome == "" {
|
|
||||||
// Default to ~/.local/share/amfora
|
|
||||||
bkmkDir = filepath.Join(home, ".local", "share", "amfora")
|
|
||||||
} else {
|
|
||||||
bkmkDir = filepath.Join(basedir.DataHome, "amfora")
|
bkmkDir = filepath.Join(basedir.DataHome, "amfora")
|
||||||
}
|
}
|
||||||
}
|
|
||||||
bkmkPath = filepath.Join(bkmkDir, "bookmarks.toml")
|
bkmkPath = filepath.Join(bkmkDir, "bookmarks.toml")
|
||||||
|
|
||||||
// *** Create necessary files and folders ***
|
// *** Create necessary files and folders ***
|
||||||
|
Loading…
Reference in New Issue
Block a user