From 926fff0e6a679da63ae351c9180cff463f79794e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patryk=20Nied=C5=BAwiedzi=C5=84ski?= Date: Mon, 12 Oct 2020 20:48:21 +0200 Subject: [PATCH 1/3] Remove basedir check (#101) --- config/config.go | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/config/config.go b/config/config.go index bf534cc..33a2b4e 100644 --- a/config/config.go +++ b/config/config.go @@ -62,12 +62,7 @@ func Init() error { configDir = amforaAppData } else { // 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") @@ -84,12 +79,7 @@ func Init() error { tofuDBDir = amforaAppData } else { // 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") @@ -99,12 +89,7 @@ func Init() error { bkmkDir = amforaAppData } else { // 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") From 80b1d1837574c61b6af38a6a15d16048e7c2099c Mon Sep 17 00:00:00 2001 From: makeworld Date: Mon, 12 Oct 2020 14:49:21 -0400 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=93=9D=20Add=20#101=20to=20changelog?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d4592c..4bf6a95 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 - The web browser code doesn't check for Xorg anymore, just display variables (#93) - Bookmarks can be made to non-gemini URLs (#94) +- Remove pointless directory fallbacks (#101) ### Fixed - XDG user dir file is parsed instead of looking for XDG env vars (#97, #100) From 9292d86c45a54e3e2d3edfdf3822eb239b6be3da Mon Sep 17 00:00:00 2001 From: makeworld Date: Sat, 24 Oct 2020 12:22:41 -0400 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=93=9D=20Show=20build=20status=20for?= =?UTF-8?q?=20master=20branch=20only?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 949336b..cee35bc 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@
Image modified from: amphora by Alvaro Cabrera from the Noun Project
-[![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) [![license GPLv3](https://img.shields.io/github/license/makeworld-the-better-one/amfora)](https://www.gnu.org/licenses/gpl-3.0.en.html)