clean-up

Author: sgreben

Makefile

@@ -1,4 +1,4 @@
-VERSION = 1.2.1
+VERSION = 1.2.2
 
 APP      := http-file-server
 PACKAGES := $(shell go list -f {{.Dir}} ./...)

README.md

@@ -60,14 +60,14 @@ Or [download a binary](https://github.com/sgreben/http-file-server/releases/late
 
 ```sh
 # Linux
-curl -L https://github.com/sgreben/http-file-server/releases/download/1.2.1/http-file-server_1.2.1_linux_x86_64.tar.gz | tar xz
+curl -L https://github.com/sgreben/http-file-server/releases/download/1.2.2/http-file-server_1.2.2_linux_x86_64.tar.gz | tar xz
 
 # OS X
-curl -L https://github.com/sgreben/http-file-server/releases/download/1.2.1/http-file-server_1.2.1_osx_x86_64.tar.gz | tar xz
+curl -L https://github.com/sgreben/http-file-server/releases/download/1.2.2/http-file-server_1.2.2_osx_x86_64.tar.gz | tar xz
 
 # Windows
-curl -LO https://github.com/sgreben/http-file-server/releases/download/1.2.1/http-file-server_1.2.1_windows_x86_64.zip
-unzip versions_1.2.1_windows_x86_64.zip
+curl -LO https://github.com/sgreben/http-file-server/releases/download/1.2.2/http-file-server_1.2.2_windows_x86_64.zip
+unzip versions_1.2.2_windows_x86_64.zip
 ```
 
 ## Use it

main.go

@@ -88,7 +88,8 @@ func server(addr string, routes routes) error {
 		log.Printf("serving local path %q on %q", path, route)
 	}
 
-	if _, ok := handlers[rootRoute]; !ok && len(routes.Values) > 0 {
+	_, rootRouteTaken := handlers[rootRoute]
+	if !rootRouteTaken {
 		route := routes.Values[0].Route
 		mux.Handle(rootRoute, http.RedirectHandler(route, http.StatusTemporaryRedirect))
 		log.Printf("redirecting to %q from %q", route, rootRoute)

routes.go

@@ -32,9 +32,9 @@ func (fv *routes) Set(v string) error {
 	}
 	i := strings.Index(v, separator)
 	var route, path string
+	var err error
 	if i <= 0 {
 		path = strings.TrimPrefix(v, "=")
-		var err error
 		path, err = filepath.Abs(path)
 		if err != nil {
 			return err
@@ -43,6 +43,10 @@ func (fv *routes) Set(v string) error {
 	} else {
 		route = v[:i]
 		path = v[i+len(separator):]
+		path, err = filepath.Abs(path)
+		if err != nil {
+			return err
+		}
 		if !strings.HasPrefix(route, "/") {
 			route = "/" + route
 		}