From 3cb15cb2578f40654730f58fad0e1d06f9273a4d Mon Sep 17 00:00:00 2001 From: makeworld Date: Fri, 18 Sep 2020 14:00:50 -0400 Subject: [PATCH 01/12] =?UTF-8?q?=F0=9F=94=A8=20Support=20macOS=20find=20c?= =?UTF-8?q?md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index b9a1a5b..5bd59ef 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ GITV != git describe --tags GITC != git rev-parse --verify HEAD -SRC != find -type f -name '*.go' ! -name '*_test.go' -TEST != find -type f -name '*_test.go' +SRC != find . -type f -name '*.go' ! -name '*_test.go' +TEST != find . -type f -name '*_test.go' PREFIX ?= /usr/local VERSION ?= $(GITV) From cceedfac155d538365228eecbd0a87c2760064ba Mon Sep 17 00:00:00 2001 From: Alex Wennerberg Date: Fri, 18 Sep 2020 14:44:31 -0700 Subject: [PATCH 02/12] Emoji Favicons (#90) --- display/bookmarks.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/display/bookmarks.go b/display/bookmarks.go index 68d819f..2f292ab 100644 --- a/display/bookmarks.go +++ b/display/bookmarks.go @@ -71,7 +71,7 @@ func bkmkInit() { // It also accepts a bool indicating whether this page already has a bookmark. // It returns the bookmark name and the bookmark action: // 1, 0, -1 for add/update, cancel, and remove -func openBkmkModal(name string, exists bool) (string, int) { +func openBkmkModal(name string, exists bool, favicon string) (string, int) { // Basically a copy of Input() // Reset buttons before input field, to make sure the input is in focus @@ -86,6 +86,9 @@ func openBkmkModal(name string, exists bool) (string, int) { // Remove and re-add input field - to clear the old text bkmkModal.GetForm().Clear(false) + if favicon != "" && !exists { + name = favicon + " " + name + } bkmkModalText = "" bkmkModal.GetForm().AddInputField("Name: ", name, 0, nil, func(text string) { @@ -136,10 +139,10 @@ func addBookmark() { // Can't make bookmarks for other kinds of URLs return } - - name, exists := bookmarks.Get(tabs[curTab].page.URL) + curPage := tabs[curTab].page + name, exists := bookmarks.Get(curPage.URL) // Open a bookmark modal with the current name of the bookmark, if it exists - newName, action := openBkmkModal(name, exists) + newName, action := openBkmkModal(name, exists, curPage.Favicon) switch action { case 1: // Add/change the bookmark From b7a64ace1778aba6e2748c7fe8e345f9e7c15cec Mon Sep 17 00:00:00 2001 From: makeworld Date: Fri, 18 Sep 2020 17:47:02 -0400 Subject: [PATCH 03/12] =?UTF-8?q?=F0=9F=93=9D=20Add=20#90=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 2e07554..0101863 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - `ansi` config setting, to disable ANSI colors in pages (#79, #86) - Edit current URL with e (#87) +- If `emoji_favicons` is enabled, new bookmarks will have the domain's favicon prepended (#69, #90) ### Changed - Disabling the `color` config setting also disables ANSI colors in pages (#79, #86) From 80b8228683fe5709f823282a4cecca3af0bfa988 Mon Sep 17 00:00:00 2001 From: makeworld Date: Sun, 20 Sep 2020 17:33:45 -0400 Subject: [PATCH 04/12] =?UTF-8?q?=F0=9F=93=9D=20Add=20brew=20HEAD=20instal?= =?UTF-8?q?l=20to=20readme?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 8ce0c3c..949336b 100644 --- a/README.md +++ b/README.md @@ -61,22 +61,35 @@ brew upgrade amfora ``` ### From Source -This section is for programmers who want to install from source. Make sure you're using Go 1.13 at least, as earlier versions will fail to build. +This section is for advanced users who want to install the latest (possibly unstable) version of Amfora. -The recommended way of installing Amfora fom source is using the Makefile. +**Requirements:** +- Go 1.13 or later +- GNU Make -On Windows, you need install make, which can be done with [Chocolatey](https://chocolatey.org/install): `choco install make`. Please note the Makefile does not intend to support Windows, and so there may be issues. +Please note the Makefile does not intend to support Windows, and so there may be issues. ```shell git clone https://github.com/makeworld-the-better-one/amfora cd amfora # git checkout v1.2.3 # Optionally pin to a specific version instead of the latest commit -make +make # Might be gmake on macOS sudo make install # If you want to install the binary for all users ``` Because you installed with the Makefile, running `amfora -v` will tell you exactly what commit the binary was built from. +MacOS users can also use [Homebrew](https://brew.sh/) to install the latest commit of Amfora: + +``` +brew tap makeworld-the-better-one/tap +brew install --HEAD amfora +``` +You can update it with: +``` +brew upgrade --fetch-HEAD amfora +``` + ## Usage Just call `amfora` or `amfora ` on the terminal. On Windows it might be `amfora.exe` instead. From e84cebc88c4b0f19ac71eefd48e5eb56f01d1d50 Mon Sep 17 00:00:00 2001 From: makeworld Date: Wed, 30 Sep 2020 18:04:59 -0400 Subject: [PATCH 05/12] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20to=20go-ise?= =?UTF-8?q?moji=20v1.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0101863..68bb40d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - Disabling the `color` config setting also disables ANSI colors in pages (#79, #86) +- Updated [go-isemoji](https://github.com/makeworld-the-better-one/go-isemoji) to v1.1.0 to support Emoji 13.1 for favicons ## [v1.5.0] - 2020-09-01 diff --git a/go.mod b/go.mod index b129432..281a5bb 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/gdamore/tcell v1.3.1-0.20200608133353-cb1e5d6fa606 github.com/google/go-cmp v0.5.0 // indirect github.com/makeworld-the-better-one/go-gemini v0.8.4 - github.com/makeworld-the-better-one/go-isemoji v1.0.0 + github.com/makeworld-the-better-one/go-isemoji v1.1.0 github.com/makeworld-the-better-one/progressbar/v3 v3.3.5-0.20200710151429-125743e22b4f github.com/mitchellh/go-homedir v1.1.0 github.com/mitchellh/mapstructure v1.3.1 // indirect diff --git a/go.sum b/go.sum index c0f0870..c785df7 100644 --- a/go.sum +++ b/go.sum @@ -127,8 +127,8 @@ github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzR github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/makeworld-the-better-one/go-gemini v0.8.4 h1:ntsQ9HnlJCmC9PDqXp/f1SCALjBMwh69BbT4BhFRFaw= github.com/makeworld-the-better-one/go-gemini v0.8.4/go.mod h1:P7/FbZ+IEIbA/d+A0Y3w2GNgD8SA2AcNv7aDGJbaWG4= -github.com/makeworld-the-better-one/go-isemoji v1.0.0 h1:W3O4+qwtXeT8PUDzcQ1UjxiupQWgc/oJHpqwrllx3xM= -github.com/makeworld-the-better-one/go-isemoji v1.0.0/go.mod h1:FBjkPl9rr0G4vlZCc+Mr+QcnOfGCTbGWYW8/1sp06I0= +github.com/makeworld-the-better-one/go-isemoji v1.1.0 h1:wZBHOKB5zAIgaU2vaWnXFDDhatebB8TySrNVxjVV84g= +github.com/makeworld-the-better-one/go-isemoji v1.1.0/go.mod h1:FBjkPl9rr0G4vlZCc+Mr+QcnOfGCTbGWYW8/1sp06I0= github.com/makeworld-the-better-one/progressbar/v3 v3.3.5-0.20200710151429-125743e22b4f h1:YEUlTs5gb35UlBLTgqrub9axWTYB3d7/8TxrkJDZpRI= github.com/makeworld-the-better-one/progressbar/v3 v3.3.5-0.20200710151429-125743e22b4f/go.mod h1:X6sxWNi9PBgQybpR4fpXPVD5fm7svLqZTQ5DJuERIoM= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= From 391f9bfef0569fa63ac7d9f0a2d10bc723ab81bc Mon Sep 17 00:00:00 2001 From: grimmware Date: Thu, 1 Oct 2020 21:05:29 +0100 Subject: [PATCH 06/12] Remove protocol filter for bookmarking --- display/bookmarks.go | 5 ----- 1 file changed, 5 deletions(-) diff --git a/display/bookmarks.go b/display/bookmarks.go index 2f292ab..0b4f0c4 100644 --- a/display/bookmarks.go +++ b/display/bookmarks.go @@ -3,7 +3,6 @@ package display import ( "fmt" "strconv" - "strings" "github.com/gdamore/tcell" "github.com/makeworld-the-better-one/amfora/bookmarks" @@ -135,10 +134,6 @@ func Bookmarks(t *tab) { // It is the high-level way of doing it. It should be called in a goroutine. // It can also be called to edit an existing bookmark. func addBookmark() { - if !strings.HasPrefix(tabs[curTab].page.URL, "gemini://") { - // Can't make bookmarks for other kinds of URLs - return - } curPage := tabs[curTab].page name, exists := bookmarks.Get(curPage.URL) // Open a bookmark modal with the current name of the bookmark, if it exists From 4a71b691eaee6e9fa70dff54c8b8f56a493eeb55 Mon Sep 17 00:00:00 2001 From: Timur Ismagilov Date: Fri, 2 Oct 2020 02:06:50 +0500 Subject: [PATCH 07/12] Implement a more robust algorithm for opening web links on unices (#93) Co-authored-by: makeworld <25111343+makeworld-the-better-one@users.noreply.github.com> --- webbrowser/open_browser_darwin.go | 1 + webbrowser/open_browser_other.go | 1 + webbrowser/open_browser_unix.go | 55 ++++++++++++++++++------------ webbrowser/open_browser_windows.go | 1 + 4 files changed, 37 insertions(+), 21 deletions(-) diff --git a/webbrowser/open_browser_darwin.go b/webbrowser/open_browser_darwin.go index e9992b7..44c522e 100644 --- a/webbrowser/open_browser_darwin.go +++ b/webbrowser/open_browser_darwin.go @@ -4,6 +4,7 @@ package webbrowser import "os/exec" +// Open opens `url` in default system browser. func Open(url string) (string, error) { err := exec.Command("open", url).Start() if err != nil { diff --git a/webbrowser/open_browser_other.go b/webbrowser/open_browser_other.go index 706953f..9501034 100644 --- a/webbrowser/open_browser_other.go +++ b/webbrowser/open_browser_other.go @@ -4,6 +4,7 @@ package webbrowser import "fmt" +// Open opens `url` in default system browser, but not on this OS. func Open(url string) (string, error) { return "", fmt.Errorf("unsupported OS for default HTTP handling. Set a command in the config") } diff --git a/webbrowser/open_browser_unix.go b/webbrowser/open_browser_unix.go index 99ecbb5..4d265be 100644 --- a/webbrowser/open_browser_unix.go +++ b/webbrowser/open_browser_unix.go @@ -9,27 +9,40 @@ import ( "os/exec" ) -// OpenInBrowser checks for the presence of a display server -// and environment variables indicating a gui is present. If found -// then xdg-open is called on a url to open said url in the default -// gui web browser for the system +// Open opens `url` in default system browser. It tries to do so in two +// ways (xdg-open and $BROWSER). It only works if there is a display +// server working. +// +// bouncepaw: I tried to support TTYs as well. The idea was to open +// a browser in foreground and return back to amfora after the browser +// is closed. While all browsers I tested opened correctly (w3m, lynx), +// I couldn't make it restore amfora correctly. The screen always ended +// up distorted. None of my stunts with altscreen buffers helped. func Open(url string) (string, error) { - disp := os.Getenv("DISPLAY") - wayland := os.Getenv("WAYLAND_DISPLAY") - _, err := exec.LookPath("Xorg") - if disp == "" && wayland == "" && err != nil { - return "", fmt.Errorf("no gui is available") + var ( + // In prev versions there was also Xorg executable checked for. + // I don't see any reason to check for it. + xorgDisplay = os.Getenv("DISPLAY") + waylandDisplay = os.Getenv("WAYLAND_DISPLAY") + xdgOpenPath, xdgOpenNotFoundErr = exec.LookPath("xdg-open") + envBrowser = os.Getenv("BROWSER") + ) + switch { + case xorgDisplay == "" && waylandDisplay == "": + return "", fmt.Errorf("no display server was found") + case xdgOpenNotFoundErr == nil: // Prefer xdg-open over $BROWSER + // Use start rather than run or output in order + // to make browser running in background. + if err := exec.Command(xdgOpenPath, url).Start(); err != nil { + return "", err + } + return "Opened in system default web browser", nil + case envBrowser != "": + if err := exec.Command(envBrowser, url).Start(); err != nil { + return "", err + } + return "Opened in system default web browser", nil + default: + return "", fmt.Errorf("could not determine system browser") } - - _, err = exec.LookPath("xdg-open") - if err != nil { - return "", fmt.Errorf("xdg-open command not found, cannot open in web browser") - } - // Use start rather than run or output in order - // to release the process and not block - err = exec.Command("xdg-open", url).Start() - if err != nil { - return "", err - } - return "Opened in system default web browser", nil } diff --git a/webbrowser/open_browser_windows.go b/webbrowser/open_browser_windows.go index 61b4bb4..66b8c46 100644 --- a/webbrowser/open_browser_windows.go +++ b/webbrowser/open_browser_windows.go @@ -5,6 +5,7 @@ package webbrowser import "os/exec" +// Open opens `url` in default system browser. func Open(url string) (string, error) { err := exec.Command("rundll32", "url.dll,FileProtocolHandler", url).Start() if err != nil { From 959ed796969963370764f3ebea0ca1f673479388 Mon Sep 17 00:00:00 2001 From: makeworld Date: Thu, 1 Oct 2020 17:10:14 -0400 Subject: [PATCH 08/12] =?UTF-8?q?=F0=9F=93=9D=20Add=20#93=20to=20changelog?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 68bb40d..dace2a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,10 +9,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - `ansi` config setting, to disable ANSI colors in pages (#79, #86) - Edit current URL with e (#87) - If `emoji_favicons` is enabled, new bookmarks will have the domain's favicon prepended (#69, #90) +- The `BROWSER` env. var. is now also checked when opening web links on Unix (#93) ### Changed - Disabling the `color` config setting also disables ANSI colors in pages (#79, #86) - 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) ## [v1.5.0] - 2020-09-01 From 5186a585b3fe84be2e8822464c0569c5c3df3e04 Mon Sep 17 00:00:00 2001 From: makeworld Date: Thu, 1 Oct 2020 17:28:31 -0400 Subject: [PATCH 09/12] =?UTF-8?q?=F0=9F=93=9D=20Add=20#94=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 dace2a1..35cd8cd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Disabling the `color` config setting also disables ANSI colors in pages (#79, #86) - 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) ## [v1.5.0] - 2020-09-01 From efc10a2b3e5a795d9400376fab30f1d6dff6dbf4 Mon Sep 17 00:00:00 2001 From: makeworld Date: Thu, 1 Oct 2020 19:08:26 -0400 Subject: [PATCH 10/12] =?UTF-8?q?=F0=9F=90=9B=20Don't=20allow=20creation?= =?UTF-8?q?=20of=20invalid=20bkmks=20-=20fixes=20#95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- display/bookmarks.go | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/display/bookmarks.go b/display/bookmarks.go index 0b4f0c4..8541751 100644 --- a/display/bookmarks.go +++ b/display/bookmarks.go @@ -134,16 +134,22 @@ func Bookmarks(t *tab) { // It is the high-level way of doing it. It should be called in a goroutine. // It can also be called to edit an existing bookmark. func addBookmark() { - curPage := tabs[curTab].page - name, exists := bookmarks.Get(curPage.URL) + t := tabs[curTab] + p := t.page + + if !t.hasContent() { + // It's an about: page, or a malformed one + return + } + name, exists := bookmarks.Get(p.URL) // Open a bookmark modal with the current name of the bookmark, if it exists - newName, action := openBkmkModal(name, exists, curPage.Favicon) + newName, action := openBkmkModal(name, exists, p.Favicon) switch action { case 1: // Add/change the bookmark - bookmarks.Set(tabs[curTab].page.URL, newName) + bookmarks.Set(p.URL, newName) case -1: - bookmarks.Remove(tabs[curTab].page.URL) + bookmarks.Remove(p.URL) } // Other case is action = 0, meaning "Cancel", so nothing needs to happen } From 270dddfbc2b5c004f274901cd4357aecf7807f13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patryk=20Nied=C5=BAwiedzi=C5=84ski?= Date: Fri, 9 Oct 2020 02:54:07 +0200 Subject: [PATCH 11/12] XDG config (#100) Co-authored-by: makeworld <25111343+makeworld-the-better-one@users.noreply.github.com> --- config/config.go | 29 ++++++++++++++++------------- go.mod | 1 + go.sum | 2 ++ 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/config/config.go b/config/config.go index 4b2d6f3..bf534cc 100644 --- a/config/config.go +++ b/config/config.go @@ -13,6 +13,8 @@ import ( "github.com/gdamore/tcell" "github.com/makeworld-the-better-one/amfora/cache" homedir "github.com/mitchellh/go-homedir" + "github.com/rkoesters/xdg/basedir" + "github.com/rkoesters/xdg/userdirs" "github.com/spf13/viper" "gitlab.com/tslocum/cview" ) @@ -60,12 +62,11 @@ func Init() error { configDir = amforaAppData } else { // Unix / POSIX system - xdg_config, ok := os.LookupEnv("XDG_CONFIG_HOME") - if ok && strings.TrimSpace(xdg_config) != "" { - configDir = filepath.Join(xdg_config, "amfora") - } else { + if basedir.ConfigHome == "" { // Default to ~/.config/amfora configDir = filepath.Join(home, ".config", "amfora") + } else { + configDir = filepath.Join(basedir.ConfigHome, "amfora") } } configPath = filepath.Join(configDir, "config.toml") @@ -83,12 +84,11 @@ func Init() error { tofuDBDir = amforaAppData } else { // XDG cache dir on POSIX systems - xdg_cache, ok := os.LookupEnv("XDG_CACHE_HOME") - if ok && strings.TrimSpace(xdg_cache) != "" { - tofuDBDir = filepath.Join(xdg_cache, "amfora") - } else { + if basedir.CacheHome == "" { // Default to ~/.cache/amfora tofuDBDir = filepath.Join(home, ".cache", "amfora") + } else { + tofuDBDir = filepath.Join(basedir.CacheHome, "amfora") } } tofuDBPath = filepath.Join(tofuDBDir, "tofu.toml") @@ -99,12 +99,11 @@ func Init() error { bkmkDir = amforaAppData } else { // XDG data dir on POSIX systems - xdg_data, ok := os.LookupEnv("XDG_DATA_HOME") - if ok && strings.TrimSpace(xdg_data) != "" { - bkmkDir = filepath.Join(xdg_data, "amfora") - } else { + if basedir.DataHome == "" { // 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") @@ -151,7 +150,11 @@ func Init() error { if viper.GetString("a-general.downloads") == "" { // Find default Downloads dir // This seems to work for all OSes? - DownloadsDir = filepath.Join(home, "Downloads") + if userdirs.Download == "" { + DownloadsDir = filepath.Join(home, "Downloads") + } else { + DownloadsDir = userdirs.Download + } // Create it just in case err = os.MkdirAll(DownloadsDir, 0755) if err != nil { diff --git a/go.mod b/go.mod index 281a5bb..a94d5e1 100644 --- a/go.mod +++ b/go.mod @@ -13,6 +13,7 @@ require ( github.com/mitchellh/go-homedir v1.1.0 github.com/mitchellh/mapstructure v1.3.1 // indirect github.com/pelletier/go-toml v1.8.0 // indirect + github.com/rkoesters/xdg v0.0.0-20181125232953-edd15b846f9b github.com/spf13/afero v1.2.2 // indirect github.com/spf13/cast v1.3.1 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect diff --git a/go.sum b/go.sum index c785df7..8639569 100644 --- a/go.sum +++ b/go.sum @@ -177,6 +177,8 @@ github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7z github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/rivo/uniseg v0.1.0 h1:+2KBaVoUmb9XzDsrx/Ct0W/EYOSFf/nWTauy++DprtY= github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= +github.com/rkoesters/xdg v0.0.0-20181125232953-edd15b846f9b h1:8NiY6v9/IlFU8osj1L7kqzRbrG6e3izRQQjGze1Q1R0= +github.com/rkoesters/xdg v0.0.0-20181125232953-edd15b846f9b/go.mod h1:T1HolqzmdHnJIH6p7A9LDuvYGQgEHx9ijX3vKgDKU60= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= From 96fda081bb5fe83398937a5f0686725880d0b483 Mon Sep 17 00:00:00 2001 From: makeworld Date: Thu, 8 Oct 2020 20:56:28 -0400 Subject: [PATCH 12/12] =?UTF-8?q?=F0=9F=93=9D=20Add=20#100=20to=20changelo?= =?UTF-8?q?g?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 35cd8cd..8d4592c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - `ansi` config setting, to disable ANSI colors in pages (#79, #86) - Edit current URL with e (#87) - If `emoji_favicons` is enabled, new bookmarks will have the domain's favicon prepended (#69, #90) -- The `BROWSER` env. var. is now also checked when opening web links on Unix (#93) +- The `BROWSER` env var is now also checked when opening web links on Unix (#93) ### Changed - Disabling the `color` config setting also disables ANSI colors in pages (#79, #86) @@ -17,6 +17,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - The web browser code doesn't check for Xorg anymore, just display variables (#93) - Bookmarks can be made to non-gemini URLs (#94) +### Fixed +- XDG user dir file is parsed instead of looking for XDG env vars (#97, #100) + ## [v1.5.0] - 2020-09-01 ### Added