Merge branch 'master' into tagcloud

This commit is contained in:
Simon Frostick 2018-03-09 20:05:40 +02:00
commit aebdf7ca27

View file

@ -3,6 +3,7 @@ package main
import (
"os"
fp "path/filepath"
"github.com/RadhiFadlillah/shiori/cmd"
db "github.com/RadhiFadlillah/shiori/database"
@ -12,6 +13,11 @@ import (
func main() {
databasePath := "shiori.db"
if value, found := os.LookupEnv("ENV_SHIORI_DB"); found {
// If ENV_SHIORI_DB is directory, append "shiori.db" as filename
if f1, err := os.Stat(value); err == nil && f1.IsDir() {
value = fp.Join(value, "shiori.db")
}
databasePath = value
}