From 6ea749585f4db3d1892622064b23d061b1cd9815 Mon Sep 17 00:00:00 2001
From: Camille Scholtz <camille@airmail.cc>
Date: Fri, 28 Dec 2018 00:19:04 +0100
Subject: [PATCH] Use less hardcoded paths, improve README

---
 README.md | 6 +++++-
 blocks.go | 6 ++++--
 popups.go | 3 ++-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 17600db..95df19a 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,11 @@ melonbar - A concurrent, hackable bar/panel for X written in Go.
 
 `go get github.com/onodera-punpun/melonbar`
 
-`melonbar` depends on Go 1.9 or newer.
+Or for a binary that includes embedded static files:
+
+`packr2 get github.com/onodera-punpun/melonbar`
+
+`melonbar` depends on Go 1.9 or newer and [packr2](https://github.com/gobuffalo/packr/tree/master/v2).
 
 
 ## USAGE
diff --git a/blocks.go b/blocks.go
index 398e8a9..706b1ba 100644
--- a/blocks.go
+++ b/blocks.go
@@ -4,6 +4,7 @@ import (
 	"bufio"
 	"log"
 	"os"
+	"path"
 	"strconv"
 	"time"
 
@@ -14,6 +15,7 @@ import (
 	"github.com/BurntSushi/xgbutil/xprop"
 	"github.com/fhs/gompd/mpd"
 	"github.com/fsnotify/fsnotify"
+	"github.com/rkoesters/xdg/basedir"
 )
 
 func (bar *Bar) clock() {
@@ -150,10 +152,10 @@ func (bar *Bar) todo() {
 	if err != nil {
 		log.Fatalln(err)
 	}
-	if err := w.Add("/home/onodera/.todo"); err != nil {
+	if err := w.Add(path.Join(basedir.Home, ".todo")); err != nil {
 		log.Fatalln(err)
 	}
-	f, err := os.Open("/home/onodera/.todo")
+	f, err := os.Open(path.Join(basedir.Home, ".todo"))
 	if err != nil {
 		log.Fatalln(err)
 	}
diff --git a/popups.go b/popups.go
index fbbc122..256e473 100644
--- a/popups.go
+++ b/popups.go
@@ -10,6 +10,7 @@ import (
 
 	"github.com/BurntSushi/xgbutil/xgraphics"
 	"github.com/fhs/gompd/mpd"
+	"github.com/rkoesters/xdg/userdirs"
 	"golang.org/x/image/font"
 	"golang.org/x/image/math/fixed"
 )
@@ -45,7 +46,7 @@ func (popup *Popup) music(c *mpd.Client) error {
 
 	// Find album art.
 	var f interface{}
-	f, err = os.Open(path.Join("/home/onodera/media/music/", path.Dir(
+	f, err = os.Open(path.Join(userdirs.Music, path.Dir(
 		cur["file"]), "cover_popup.png"))
 	if err != nil {
 		f, err = box.Open("images/cover.png")